mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: CMake CI updated to support the changes introduced in the latest Conan version

Browse Source
This commit is contained in:
Mateusz Pusz
2024-05-08 14:35:00 +02:00
parent 999012dd97
commit 23ab3ecef4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci-test-package-cmake.yml vendored
View File

@ -221,7 +221,11 @@ jobs:
run: | run: |
conan install . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.mp-units.build:all=False \ 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 }} -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 - name: Configure mp-units CMake
if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC' if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC'
shell: cmd shell: cmd
@ -246,7 +250,7 @@ jobs:
shell: bash shell: bash
working-directory: test_package working-directory: test_package
run: | 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) - name: Build test_package CMake (local build)
if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC' if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC'
shell: cmd shell: cmd