Skip to content

Commit 52f9030

Browse files
[Github CI] Reenable MSVC compiler testing
Signed-off-by: Christian Parpart <[email protected]>
1 parent 83f5e4c commit 52f9030

File tree

3 files changed

+34
-14
lines changed

3 files changed

+34
-14
lines changed

.github/workflows/main.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,27 @@ on:
1212
jobs:
1313

1414
# FIXME: We're having a linker error wrt. Catch2 on Windows with MSVC
15-
# windows-msvc:
16-
# name: "Windows - MSVC"
17-
# runs-on: windows-latest
18-
# steps:
19-
# - uses: actions/checkout@v4
20-
# - name: Install dependencies
21-
# run: choco install ninja
22-
# - name: configure
23-
# run: cmake --preset windows-cl-release
24-
# - name: build
25-
# run: cmake --build --preset windows-cl-release
26-
# - name: test
27-
# run: ctest --preset windows-cl-release -VV
15+
windows-msvc:
16+
name: "Windows - MSVC"
17+
runs-on: windows-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Install dependencies
21+
run: choco install ninja
22+
- name: "vcpkg: Install dependencies"
23+
uses: lukka/[email protected]
24+
id: runvcpkg
25+
with:
26+
vcpkgDirectory: ${{ runner.workspace }}/vcpkg
27+
vcpkgGitCommitId: 80403036a665cb8fcc1a1b3e17593d20b03b2489
28+
- name: configure
29+
run: cmake --preset windows-cl-release -D REFLECTION_TESTING=ON
30+
env:
31+
VCPKG_ROOT: "${{ runner.workspace }}/vcpkg"
32+
- name: build
33+
run: cmake --build --preset windows-cl-release
34+
- name: test
35+
run: ctest --preset windows-cl-release -VV
2836

2937
ubuntu24-clang:
3038
name: "Ubuntu Linux - Clang ${{ matrix.clang_version }}"
@@ -43,7 +51,7 @@ jobs:
4351
- name: Install ninja and catch2
4452
run: sudo apt-get install ninja-build catch2
4553
- name: configure
46-
run: cmake --preset linux-clang-release -D REFLECTION_TESTING=ON
54+
run: cmake --preset linux-clang-release -D REFLECTION_TESTING=ON
4755
- name: build
4856
run: cmake --build --preset linux-clang-release
4957
- name: test

cmake/ThirdParties.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ message(STATUS "base dir: ${FETCHCONTENT_BASE_DIR}")
1919
message(STATUS "dnld dir: ${3rdparty_DOWNLOAD_DIR}")
2020

2121
macro(ThirdPartiesAdd_Catch2)
22+
find_package(Catch2 QUIET)
23+
if (Catch2_FOUND)
24+
message(STATUS "Catch2 found: ${Catch2_DIR}")
25+
return()
26+
endif()
2227
set(3rdparty_Catch2_VERSION "3.4.0" CACHE STRING "Embedded catch2 version")
2328
set(3rdparty_Catch2_CHECKSUM "SHA256=122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb" CACHE STRING "Embedded catch2 checksum")
2429
set(3rdparty_Catch2_URL "https://github.com/catchorg/Catch2/archive/refs/tags/v${3rdparty_Catch2_VERSION}.tar.gz")

vcpkg.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3+
"builtin-baseline": "80403036a665cb8fcc1a1b3e17593d20b03b2489",
4+
"dependencies": [
5+
{ "name": "catch2", "version>=": "3.4.0" }
6+
]
7+
}

0 commit comments

Comments
 (0)