Skip to content

Commit 57bc276

Browse files
committed
follow conf from DGtal
1 parent 4c5dd39 commit 57bc276

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/build.yml

+10-8
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
15+
CONFIG_WINDOWS: -DWITH_OPENMP=true
1616

1717
jobs:
1818
build:
@@ -44,12 +44,14 @@ jobs:
4444

4545
- name: Create conan default profile
4646
if: matrix.os == 'windows-latest'
47-
run: conan profile detect --force
48-
47+
run: |
48+
conan profile detect --force
49+
50+
4951
- uses: actions/cache@v4
5052
if: matrix.os == 'windows-latest'
5153
with:
52-
path: ~/.conan
54+
path: ~/.conan2
5355
key: ${{ runner.os }}-conan2-Release
5456

5557

@@ -88,13 +90,13 @@ jobs:
8890
shell: bash
8991
working-directory: ${{runner.workspace}}/build
9092
run: |
91-
conan install $GITHUB_WORKSPACE --build=missing
9293
git clone --depth 1 https://github.com/DGtal-team/DGtal.git
9394
cd DGtal
95+
conan install . --build=missing
9496
mkdir buildDGtal
9597
cd buildDGtal
96-
echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
97-
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
98+
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
99+
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
98100
cmake --build . --config Release --parallel 3
99101
100102
- name: Configure CMake (linux)
@@ -114,7 +116,7 @@ jobs:
114116
working-directory: "${{runner.workspace}}/build"
115117
run: |
116118
conan install $GITHUB_WORKSPACE --build=missing
117-
cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
119+
cmake $GITHUB_WORKSPACE -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"
118120
119121
- name: Build
120122
working-directory: ${{runner.workspace}}/build

0 commit comments

Comments
 (0)