Skip to content

Commit 0c3fc51

Browse files
committed
Another test.
1 parent f2923f6 commit 0c3fc51

2 files changed

Lines changed: 26 additions & 25 deletions

File tree

.github/workflows/ci.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,23 @@ on:
1313

1414
jobs:
1515
test:
16+
name: Test (${{ matrix.name }})
1617
strategy:
18+
fail-fast: false
1719
matrix:
18-
os: [ubuntu-latest, macos-latest, windows-latest]
19-
compiler: [gcc, clang, msvc]
20-
exclude:
21-
- os: ubuntu-latest
22-
compiler: msvc
23-
- os: macos-latest
24-
compiler: msvc
25-
- os: macos-latest
26-
compiler: gcc
27-
- os: windows-latest
28-
compiler: gcc
29-
- os: windows-latest
30-
compiler: clang
20+
include:
21+
- name: Ubuntu GCC
22+
os: ubuntu-latest
23+
cc: gcc
24+
cxx: g++
25+
- name: Ubuntu Clang
26+
os: ubuntu-latest
27+
cc: clang
28+
cxx: clang++
29+
- name: macOS
30+
os: macos-latest
31+
- name: Windows
32+
os: windows-latest
3133

3234
runs-on: ${{ matrix.os }}
3335

@@ -36,6 +38,9 @@ jobs:
3638

3739
- name: Configure CMake
3840
run: cmake --preset=test
41+
env:
42+
CC: ${{ matrix.cc }}
43+
CXX: ${{ matrix.cxx }}
3944

4045
- name: Build
4146
run: cmake --build --preset=test
@@ -68,25 +73,21 @@ jobs:
6873
mkdir -p ${{ runner.temp }}/test-find-package
6974
cd ${{ runner.temp }}/test-find-package
7075
71-
# Get project name from CMakeLists.txt
72-
PACKAGE_NAME=$(grep -m1 "project(" "${{ github.workspace }}/CMakeLists.txt" | sed 's/project(\([^)]*\)).*/\1/' | awk '{print $1}')
73-
74-
# Convert paths to forward slashes for CMake (works on all platforms)
75-
INSTALL_PREFIX=$(echo "${{ runner.temp }}/install" | sed 's|\\|/|g')
76-
7776
# Create test CMakeLists.txt
7877
cat > CMakeLists.txt << EOF
7978
cmake_minimum_required(VERSION 3.20)
8079
project(test-find-package CXX)
8180
82-
set(CMAKE_PREFIX_PATH "${INSTALL_PREFIX}")
83-
find_package(${PACKAGE_NAME} REQUIRED)
81+
find_package(stlab-enum-ops REQUIRED)
8482
85-
message(STATUS "Successfully found ${PACKAGE_NAME}")
83+
message(STATUS "Successfully found stlab-enum-ops")
8684
EOF
8785
88-
# Test find_package
89-
cmake -B build -S .
86+
# Convert paths to forward slashes for CMake (works on all platforms)
87+
INSTALL_PREFIX=$(echo "${{ runner.temp }}/install" | sed 's|\\|/|g')
88+
89+
# Test find_package with CMAKE_PREFIX_PATH
90+
cmake -B build -S . -DCMAKE_PREFIX_PATH="${INSTALL_PREFIX}"
9091
9192
clang-tidy:
9293
runs-on: ubuntu-latest

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#b2d8e3ca8fe830d3c6ff6098f78dd8933f7b2437")
19+
CPMAddPackage("gh:stlab/cpp-library#77c30bc9d7b0c35359a1f0ef951e63e60e24edf7")
2020
# CPMAddPackage("gh:stlab/cpp-library@4.0.5")
2121

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

0 commit comments

Comments
 (0)