diff options
| author | Leitwolf | 2026-11-01 22:19:29 +0300 |
|---|---|---|
| committer | GitHub | 2026-11-01 22:19:29 +0300 |
| commit | c559308d862fe3f1457d0962cfb8fcbc3b3c6b2d (patch) | |
| tree | 8e3886ca88fde64f866c9d5e832b86358b763595 | |
| parent | 241b5567d09d59e82bff18287c32ada480deb8c0 (diff) | |
| parent | ba168615b03a2c8a5d763eb455340b303d3b3f1a (diff) | |
| download | catch3-fix/amalgamate-mocks.tar.gz | |
Merge branch 'devel' into fix/amalgamate-mocksfix/amalgamate-mocks
| -rw-r--r-- | .github/workflows/linux-builds.yml | 13 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 5290574b..a9c38c66 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -52,6 +52,19 @@ jobs: - name: Test run: ctest --test-dir build -j + - name: Install, and find the installed package + run: | + cmake --install build --prefix "$RUNNER_TEMP/catch3" + mkdir "$RUNNER_TEMP/consumer" + cat > "$RUNNER_TEMP/consumer/CMakeLists.txt" <<'EOF' + cmake_minimum_required(VERSION 3.16) + project(Consumer CXX) + find_package(Catch3 REQUIRED) + EOF + cmake -S "$RUNNER_TEMP/consumer" -B "$RUNNER_TEMP/consumer/build" \ + -GNinja -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_PREFIX_PATH="$RUNNER_TEMP/catch3" + thread-sanitizer: name: Ubuntu 26.04, C++17, ThreadSanitizer and UBSan runs-on: ubuntu-26.04 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6806acf0..552da5af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,6 @@ if(NOT_SUBPROJECT) # Install CMake scripts install( FILES - "extras/ParseAndAddCatchTests.cmake" "extras/Catch3.cmake" "extras/Catch3AddTests.cmake" "extras/Catch3ShardTests.cmake" |