commit 55d415547d61699cf204c31f1c944e3c98a7777c
parent 9b1fb54a3fcf8b9ea8b65fd491dffdadffe80f84
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 12 Dec 2017 15:34:11 +0100
Merge branch 'release_0.3.1' into develop
Diffstat:
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
@@ -15,29 +15,28 @@ the install directories of its dependencies.
## Release notes
+### Version 0.3.1
+
+- Update the version of the RSys dependency to 0.6: replace the deprecated
+ `[N]CHECK` macros by the new macro `CHK`.
+
### Version 0.3
- Add the `s3dut_create_thin_cylinder` function that creates a triangulated
cylinder. Both ends can be closed or left open.
-
- Add the `s3dut_create_thick_cylinder` function that creates a thick
triangulated cylinder. Both ends can be closed or left open.
-
- Add the `s3dut_create_truncated_sphere` function that creates a triangulated
UV sphere (possibly) truncated along the Z axis. Truncated ends can be closed
or left open.
-
- Add the `s3dut_create_thick_truncated_sphere` function that creates a thick
triangulated UV sphere (possibly) truncated along the Z axis. Truncated ends
can be closed or left open.
-
- Add the `s3dut_create_super_shape` function that creates a triangulated super
shape.
-
- Add the `s3dut_create_thick_truncated_super_shape` function that creates a
thick triangulated super shape (possibly) truncated along the Z axis.
Truncated ends can be closed or left open.
-
- Increase min number of slices for `s3dut_create_hemisphere` from 2 to 3.
### Version 0.2
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,7 +24,7 @@ set(S3DUT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
################################################################################
# Dependencies
################################################################################
-find_package(RCMake REQUIRED)
+find_package(RCMake 0.4 REQUIRED)
find_package(RSys 0.6 REQUIRED)
include_directories(${RSys_INCLUDE_DIR})
@@ -38,7 +38,7 @@ include(rcmake_runtime)
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(S3DUT_FILES_SRC
