star-sf

commit 0d223197656e4edf5750de2ba768d2a7c1bc30a1
parent 835db4b5f162750d960e0747d190d64d5b8001ad
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 13 Dec 2017 10:45:57 +0100

Merge branch 'release_0.5' into develop

Diffstat:
M
README.md
 | 
8
+++++++-
M
cmake/CMakeLists.txt
 | 
4
++--

2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
@@ -26,9 +26,15 @@ project from the `cmake/CMakeLists.txt` file by appending to the
 
 ## Release notes
 
+### Version 0.5
+
+- Add the pillbox microfacet distribution.
+- Update the version of the RSys dependency to 0.6: replace the deprecated
+  `[N]CHECK` macros by the new macro `CHK`.
+
 ### Version 0.4
 
-- Fix the Blinn distribution.
+- Fix the Blinn microfacet distribution.
 - Change the microfacet distribution API to no longer require the unused
   outgoing direction parameter.
 - Use and require Star-SamPling version 0.5.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SSF_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 ################################################################################
 # Dependencies
 ################################################################################
-find_package(RCMake REQUIRED)
+find_package(RCMake 0.4 REQUIRED)
 find_package(RSys 0.6 REQUIRED)
 find_package(StarSP 0.5 REQUIRED)
 include_directories(${RSys_INCLUDE_DIR} ${StarSP_INCLUDE_DIR})
@@ -39,7 +39,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys StarSP)
 # Define targets
 ################################################################################
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 4)
+set(VERSION_MINOR 5)
 set(VERSION_PATCH 0)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})