add CPP17 min required

.github/workflows/build.yml

@@ -11,7 +11,7 @@ env:
   BUILD_TYPE:   Release
   CONFIG_GLOBAL: 
   CONFIG_LINUX: 
-  CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true 
+  CONFIG_WINDOWS: -DWITH_OPENMP=true 
 
 
 jobs:
@@ -23,7 +23,6 @@ jobs:
         os: [ubuntu-latest, macOS-latest,windows-latest]
 
     steps:
-
      - uses: actions/checkout@v2
        with:
           fetch-depth: 10
@@ -38,24 +37,22 @@ jobs:
      - name: Install macOS deps
        if: matrix.os == 'macOS-latest'
        run: brew install boost ninja eigen gmp
-
      - name: Install conan
        if: matrix.os == 'windows-latest'
        id: conan
        uses: turtlebrowser/get-conan@main
        with:
-         version: 1.57.0
-
+         version: 2.4.0
      - name: Create conan default profile
        if: matrix.os == 'windows-latest'
-       run: conan profile new default --detect
+       run: |
+          conan profile detect --force
 
-     - uses: actions/cache@v3
+     - uses: actions/cache@v4
        if: matrix.os == 'windows-latest'
        with:
-         path: ~/.conan
-         key: ${{ runner.os }}-conan-Release
-
+         path: ~/.conan2
+         key: ${{ runner.os }}-conan2-Release
 
 
      - name: Create Build Environment
@@ -93,19 +90,21 @@ jobs:
        run: |
            git clone --depth 1 https://github.com/DGtal-team/DGtal.git
            cd DGtal
+           conan install . --build=missing
            mkdir buildDGtal
            cd buildDGtal
-           echo  cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
-           cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false  
+           echo  cmake .. -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"  -DBUILD_EXAMPLES=false -DBUILD_TESTING=false 
+           cmake .. -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false  
            cmake --build . --config Release --parallel 3
-
+           
      - name: Configure CMake (windows)
        if: matrix.os == 'windows-latest'
        shell: bash
        working-directory: "${{runner.workspace}}/build"
        run: |
-           ls -la D:/a/CDCVAM/build/DGtal/buildDGtal
-           cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/CDCVAM/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/CDCVAM/build/DGtal/buildDGtal"  -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+           conan install $GITHUB_WORKSPACE --build=missing
+           cmake $GITHUB_WORKSPACE -DCMAKE_POLICY_DEFAULT_CMP0091=NEW  -DCMAKE_MODULE_PATH="D:/a/CDCVAM/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/CDCVAM/build/DGtal/buildDGtal"  -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+
 
 
 

CMakeLists.txt

@@ -18,11 +18,24 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 message(STATUS "DGtal found.")
 
 
+
  # -----------------------------------------------------------------------------
- # CPP11
+ # CPP17
  # -----------------------------------------------------------------------------
- set (CMAKE_CXX_STANDARD 11)
- set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(CDCVAM_MIN_REQUIRED 17)
+ if(NOT CMAKE_CXX_STANDARD)
+   set(CMAKE_CXX_STANDARD ${CDCVAM_MIN_REQUIRED})
+ else()
+  # Throw if CMAKE_CXX_STANDARD is 98
+  if(${CMAKE_CXX_STANDARD} EQUAL 98)
+    message(FATAL_ERROR "CMAKE_CXX_STANDARD is set to ${CMAKE_CXX_STANDARD}, "
+      "but DGtalTools requires at least ${CDCVAM_MIN_REQUIRED}.")
+  endif()
+endif()
+if(NOT CMAKE_CXX_STANDARD_REQUIRED)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
 
 
 

Changelog.md

@@ -1,5 +1,9 @@
 
+
+
 # Version 1.2
+  - Fix comilation issue adding requirement of CPP17. 
+   (Bertrand Kerautret [#28](https://github.com/kerautret/CDCVAM/pull/28))
   - Add windows compilation in github action
    (Bertrand Kerautret [#33](https://github.com/kerautret/CDCVAM/pull/33))
   - Add confidence score extraction from origins.
@@ -8,10 +12,11 @@
    (Bertrand Kerautret [#30](https://github.com/kerautret/CDCVAM/pull/30))
   - Fix comilation issue of displayAccuMesh. 
    (Bertrand Kerautret [#28](https://github.com/kerautret/CDCVAM/pull/28))
-
   - Remove travis and add github actions.
    (Bertrand Kerautret [#29](https://github.com/kerautret/CDCVAM/pull/29))
 
+
+
 # Version 1.1
 
   - Fix cmake issue with boost

conanfile.txt

@@ -0,0 +1,14 @@
+[requires]
+fmt/9.1.0
+zlib/1.2.13
+boost/1.81.0
+gmp/6.3.0
+fftw/3.3.9
+
+[generators]
+CMakeDeps
+CMakeToolchain
+
+[options] 
+boost*:header_only=True
+gmp*:enable_cxx=True