From 5f8011df5c0fce584854c4eec27cc9e7eb4269cd Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Wed, 11 Oct 2023 17:00:28 +0200 Subject: [PATCH] expe conan_paths.cmake --- .github/workflows/buildAndDocumentation.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index c77a6714..bdba50b0 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -102,12 +102,11 @@ jobs: cd DGtal mkdir buildDGtal cd buildDGtal - cmake_paths echo cmake .. -DCMAKE_BUILD_TYPE=Release $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false cmake .. -DCMAKE_BUILD_TYPE=Release $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false cmake --build . --config Release --parallel 3 cat conan_paths.cmake - + ls ${{runner.workspace}}/build/DGtal/buildDGtal - name: Configure CMake (linux) if: matrix.os == 'ubuntu-latest' shell: bash @@ -124,7 +123,7 @@ jobs: if: matrix.os == 'windows-latest' shell: bash working-directory: ${{runner.workspace}}/build - run: cmake $GITHUB_WORKSPACE -DDGtal_DIR="${{runner.workspace}}/build/DGtal/buildDGtal/" -DCMAKE_BUILD_TYPE=Release -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" + run: cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="${{runner.workspace}}/build/DGtal/buildDGtal/conan_toolchain.cmake" -DDGtal_DIR="${{runner.workspace}}/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=Release -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" - name: Build working-directory: ${{runner.workspace}}/build