Skip to content

Commit 9e05c4a

Browse files
committed
fow following DGtalContrib
1 parent 39becba commit 9e05c4a

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

.github/workflows/buildAndDocumentation.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
CONFIG_GLOBAL:
1313
CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true
1414
CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue
15-
CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DDISABLE_POLYSCOPE=ON #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true
15+
CONFIG_WINDOWS: -DWITH_OPENMP=true -DDISABLE_POLYSCOPE=ON #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true
1616

1717

1818
jobs:
@@ -50,17 +50,18 @@ jobs:
5050
id: conan
5151
uses: turtlebrowser/get-conan@main
5252
with:
53-
version: 1.57.0
53+
version: 2.4.0
5454

5555
- name: Create conan default profile
5656
if: matrix.os == 'windows-latest'
57-
run: conan profile new default --detect
57+
run: |
58+
conan profile detect --force
5859
59-
- uses: actions/cache@v3
60+
- uses: actions/cache@v4
6061
if: matrix.os == 'windows-latest'
6162
with:
62-
path: ~/.conan
63-
key: ${{ runner.os }}-conan-Release
63+
path: ~/.conan2
64+
key: ${{ runner.os }}-conan2-Release
6465

6566

6667
- name: Create Build Environment
@@ -100,10 +101,11 @@ jobs:
100101
run: |
101102
git clone --depth 1 https://github.com/DGtal-team/DGtal.git
102103
cd DGtal
104+
conan install . --build=missing
103105
mkdir buildDGtal
104106
cd buildDGtal
105-
echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
106-
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
107+
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
108+
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
107109
cmake --build . --config Release --parallel 3
108110
- name: Configure CMake (linux)
109111
if: matrix.os == 'ubuntu-latest'
@@ -121,7 +123,9 @@ jobs:
121123
if: matrix.os == 'windows-latest'
122124
shell: bash
123125
working-directory: "${{runner.workspace}}/build"
124-
run: cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
126+
run: |
127+
conan install $GITHUB_WORKSPACE --build=missing
128+
cmake $GITHUB_WORKSPACE -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MODULE_PATH="D:/a/DGtalTools/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
125129
126130
- name: Build
127131
working-directory: ${{runner.workspace}}/build

conanfile.txt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[requires]
2+
fmt/9.1.0
3+
zlib/1.2.13
4+
boost/1.81.0
5+
gmp/6.3.0
6+
fftw/3.3.9
7+
8+
[generators]
9+
CMakeDeps
10+
CMakeToolchain
11+
12+
[options]
13+
boost*:header_only=True
14+
gmp*:enable_cxx=True

0 commit comments

Comments
 (0)