solstice-solver

commit bcf123293f1446c3c9c393348dc4f0741b94afc2
parent 92bbf9ae66bdc1c165263a2623946396528238b3
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 18 Dec 2018 14:41:00 +0100

Merge branch 'release_0.7.3'

Diffstat:
M
README.md
 | 
10
+++++++++-
M
cmake/CMakeLists.txt
 | 
10
+++++++---
M
src/ssol_shape.c
 | 
8
++++----

3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
@@ -13,7 +13,10 @@ The Solstice-Solver library relies on the [CMake](http://www.cmake.org) and the
 [RCMake](https://gitlab.com/vaplv/rcmake/) package to build.
 It also depends on the
 [RSys](https://gitlab.com/vaplv/rsys/),
-[Star-3D](https://gitlab.com/meso-star/star-3d/) and
+[Star-3D](https://gitlab.com/meso-star/star-3d/),
+[Star-3DUT](https://gitlab.com/meso-star/star-3dut),
+[Star-CPR](https://gitlab.com/meso-star/star-cpr),
+[Star-SF](https://gitlab.com/meso-star/star-sf) and
 [Star-SP](https://gitlab.com/meso-star/star-sp/) libraries as well as on the
 [OpenMP](http://www.openmp.org) 1.2 specification to parallelize its
 computations.
@@ -26,6 +29,11 @@ variable the install directories of its dependencies.
 
 ## Release notes
 
+### Version 0.7.3
+
+- Update the version of the RSys and StarSP dependencies. 
+- Fix a compilation warning with GCC7 and above.
+
 ### Version 0.7.2
 
 - Fix the gaussian sunshape.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -17,6 +17,10 @@ cmake_minimum_required(VERSION 2.8)
 project(solstice-solver C)
 enable_testing()
 
+if(POLICY CMP0054) # For cmake version < 3.1: disable FindOpenMP warning
+  cmake_policy(SET CMP0054 NEW)
+endif()
+
 set(SSOL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 option(NO_TEST "Do not build tests" OFF)
 
@@ -24,12 +28,12 @@ option(NO_TEST "Do not build tests" OFF)
 # Check dependencies
 ################################################################################
 find_package(RCMake 0.3 REQUIRED)
-find_package(RSys 0.6 REQUIRED)
+find_package(RSys 0.7.1 REQUIRED)
 find_package(Star3D 0.4.1 REQUIRED)
 find_package(Star3DUT 0.2 REQUIRED)
 find_package(StarCPR 0.1 REQUIRED)
 find_package(StarSF 0.4 REQUIRED)
-find_package(StarSP 0.4 REQUIRED)
+find_package(StarSP 0.8 REQUIRED)
 find_package(OpenMP 1.2 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
@@ -51,7 +55,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Star3D Star3DUT StarCPR StarSF Sta
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 7)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SSOL_FILES_SRC
diff --git a/src/ssol_shape.c b/src/ssol_shape.c
@@ -1388,11 +1388,11 @@ shape_fetched_raw_vertex_attrib
   if(res != RES_OK) return res;
 
   d3_splat(value, 1);
+
   switch(s3d_attr.type) {
-    case S3D_FLOAT3: value[2] = (double)s3d_attr.value[2];
-    case S3D_FLOAT2: value[1] = (double)s3d_attr.value[1];
-    case S3D_FLOAT:  value[0] = (double)s3d_attr.value[0];
-      break;
+    case S3D_FLOAT3: value[2] = (double)s3d_attr.value[2]; FALLTHROUGH;
+    case S3D_FLOAT2: value[1] = (double)s3d_attr.value[1]; FALLTHROUGH;
+    case S3D_FLOAT:  value[0] = (double)s3d_attr.value[0]; break;
     default: FATAL("Unexpected vertex attrib type\n"); break;
   }
   return RES_OK;