Conan file 3rd try

DGtal-team · Jan 20, 2025 · f666133 · f666133
1 parent f55c94c
commit f666133
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -82,7 +82,7 @@ jobs:
        shell: bash
        working-directory: ${{runner.workspace}}/build
        run: |
-            conan install $GITHUB_WORKSPACE --build=missing
+            conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=gnu20
             cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_WINDOWS -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
 
      - name: Build

diff --git a/.github/workflows/buildAndDocumentation-PR.yml b/.github/workflows/buildAndDocumentation-PR.yml
@@ -83,7 +83,7 @@ jobs:
        shell: bash
        working-directory: ${{runner.workspace}}/build
        run: |
-          conan install $GITHUB_WORKSPACE --build=missing  
+          conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=gnu20
           cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_GLOBAL $CONFIG_WINDOWS -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
 
      - name: Build

diff --git a/.github/workflows/pythonBindings-PR.yml b/.github/workflows/pythonBindings-PR.yml
@@ -82,7 +82,7 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}/build
         run: |
-            conan install $GITHUB_WORKSPACE --build=missing  
+            conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=gnu20
             cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS
 
 

diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml
@@ -96,7 +96,7 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}/build
         run: |
-              conan install $GITHUB_WORKSPACE --build=missing  
+              conan install $GITHUB_WORKSPACE --build=missing -s:a compiler.cppstd=gnu20 
               cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS
              
       - name: Setting build informations (Windows)

diff --git a/conanfile.txt b/conanfile.txt
@@ -11,7 +11,4 @@ CMakeToolchain
 
 [options] 
 boost*:header_only=True
-gmp*:enable_cxx=True
-
-[settings]
-compiler.cppstd=20
+gmp*:enable_cxx=True
diff --git a/src/DGtal/doc/moduleBuildDGtal.dox b/src/DGtal/doc/moduleBuildDGtal.dox
@@ -59,7 +59,7 @@ cmake will install all libraries (which may take some time for the first build).
 ```
 conan profile detect --force ##Conan profile
 cd build
-conan install .. --build=missing  
+conan install .. --build=missing -s:a compiler.cppstd=gnu20 
 cmake .. -G "Visual Studio 15 2017" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW 
 ```