From 23ab3ecef495df92418357f13bb3094efd05e668 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 8 May 2024 14:35:00 +0200 Subject: [PATCH] feat: CMake CI updated to support the changes introduced in the latest Conan version --- .github/workflows/ci-test-package-cmake.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index a41a01b2..e822d030 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -221,7 +221,11 @@ jobs: run: | conan install . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.mp-units.build:all=False \ -o cxx_modules=${{ matrix.config.cxx_modules }} -o std_format=${{ env.std_format }} - mv CMakeUserPresets.json src + - name: Provide dependencies for the build + shell: bash + working-directory: src + run: | + echo -e '{\n "version": 4,\n "include": [\n "../CMakeUserPresets.json"\n ]\n}' | cat > CMakeUserPresets.json - name: Configure mp-units CMake if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC' shell: cmd @@ -246,7 +250,7 @@ jobs: shell: bash working-directory: test_package run: | - cp ../src/CMakeUserPresets.json . + echo -e '{\n "version": 4,\n "include": [\n "../CMakeUserPresets.json"\n ]\n}' | cat > CMakeUserPresets.json - name: Build test_package CMake (local build) if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC' shell: cmd