c++14 support

.gitlab-ci.yml

@@ -38,7 +38,7 @@ clang-buster:
 
 gcc-stretch:
   stage: Build
-  script: "CI/ci-linux.sh gcc"
+  script: "CI/ci-linux.sh gcc C++14"
   variables:
      GIT_SUBMODULE_STRATEGY: recursive
   tags:
@@ -47,7 +47,7 @@ gcc-stretch:
 
 clang-stretch:
   stage: Build
-  script: "CI/ci-linux.sh clang"
+  script: "CI/ci-linux.sh clang C++14"
   variables:
      GIT_SUBMODULE_STRATEGY: recursive
   tags:

CI/ci-linux.sh

@@ -26,16 +26,9 @@ elif [ "$COMPILER" == "clang" ]; then
   BUILDPATH="clang"  
 fi  
 
-if [ "$LANGUAGE" == "C++98" ]; then
-  echo "Building with C++98";
-  BUILDPATH="$BUILDPATH-cpp98"
-elif [ "$LANGUAGE" == "C++11" ]; then
-  echo "Building with C++11";
-  OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
-  BUILDPATH="$BUILDPATH-cpp11"  
-elif [ "$LANGUAGE" == "C++14" ]; then
+if [ "$LANGUAGE" == "C++14" ]; then
   echo "Building with C++14";
-  OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' "
+  OPTIONS="$OPTIONS -DPM_FORCE_CPP14=ON "
   BUILDPATH="$BUILDPATH-cpp14"  
 fi  
 

CMakeLists.txt

@@ -12,6 +12,12 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 option(PM_BUILD_TESTS "Build polymesh tests" OFF)
 
+option(PM_FORCE_CPP14 "Build samples and tests with C++14" OFF)
+
+if (PM_FORCE_CPP14)
+    set(CMAKE_CXX_STANDARD 14)
+endif()
+
 # ==============================================================================
 # Set bin dir
 if(MSVC)

typed-geometry @ 5fa82f70

-Subproject commit 43a260233fafd9c92d49b27242311989dc1a78c1
+Subproject commit 5fa82f7024ea8f590893cccbb00ed3243eb26926

tests/objects/cube-test.cc

+#ifdef TG_SUPPORT_CXX17
+
 #include <doctest.hh>
 
 #include <glm/glm.hpp>
@@ -178,3 +180,5 @@ TEST_CASE("Objects.CubePropertiesGlm")
         m2.assert_consistency();
     }
 }
+
+#endif