Skip to content

Commit 809d3c3

Browse files
committed
Update CI workflow and cpp-library dependency
The CI workflow now sets CC and CXX environment variables conditionally based on the matrix, and splits the build/install steps accordingly. The cpp-library dependency is updated to commit 4f09b3b7f0abcc4ef1b39060ce03784920ce32e5 in CMakeLists.txt.
1 parent 4081373 commit 809d3c3

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,17 @@ jobs:
5858
cmake --preset=default
5959
cmake --build --preset=default
6060
cmake --install build/default --prefix ${{ runner.temp }}/install
61+
env:
62+
CC: ${{ matrix.cc }}
63+
CXX: ${{ matrix.cxx }}
64+
if: ${{ matrix.cc }}
65+
66+
- name: Build and Install
67+
run: |
68+
cmake --preset=default
69+
cmake --build --preset=default
70+
cmake --install build/default --prefix ${{ runner.temp }}/install
71+
if: ${{ !matrix.cc }}
6172

6273
- name: Test find_package
6374
shell: bash

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include(cmake/CPM.cmake)
1616
# NAME cpp-library
1717
# URL "${CMAKE_SOURCE_DIR}/../cpp-library"
1818
# )
19-
CPMAddPackage("gh:stlab/cpp-library#e4a3ee5dc2da1d05d44a7b74a142c94a53de8003")
19+
CPMAddPackage("gh:stlab/cpp-library#4f09b3b7f0abcc4ef1b39060ce03784920ce32e5")
2020
# CPMAddPackage("gh:stlab/cpp-library@4.0.5")
2121

2222
include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)

0 commit comments

Comments
 (0)