Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' }
- { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64', test: 'true' }
- { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' }
- { name: 'Windows x86', runner: 'windows-2022', target: 'windows-x86', test: 'true' }
- { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }
steps:
- name: Add msbuild to PATH
Expand Down
28 changes: 28 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
"VCPKG_TARGET_TRIPLET": "x64-windows-static-md"
}
},
{
"name": "vcpkg-win32-static",
"hidden": true,
"cacheVariables": {
"VCPKG_TARGET_ARCHITECTURE": "x86",
"VCPKG_TARGET_TRIPLET": "x86-windows-static-md"
}
},
{
"name": "ninja",
"hidden": true,
Expand Down Expand Up @@ -85,6 +93,16 @@
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "ci-win32",
"inherits": [
"flags-windows",
"ci-std",
"vs-2022"
],
"architecture": "Win32",
"hidden": true
},
{
"name": "ci-win64",
"inherits": [
Expand Down Expand Up @@ -182,6 +200,16 @@
"VCPKG_TARGET_TRIPLET": "x64-freebsd"
}
},
{
"name": "ci-windows-x86",
"inherits": [
"ci-build",
"ci-win32",
"dev-mode",
"vcpkg",
"vcpkg-win32-static"
]
},
{
"name": "ci-windows-x64",
"inherits": [
Expand Down
2 changes: 1 addition & 1 deletion deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (NOT TARGET tlsuv)
else ()
FetchContent_Declare(tlsuv
GIT_REPOSITORY https://github.com/openziti/tlsuv.git
GIT_TAG v0.36.2
GIT_TAG v0.36.3
)
FetchContent_MakeAvailable(tlsuv)
endif (tlsuv_DIR)
Expand Down
8 changes: 6 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@

find_package(Catch2 CONFIG REQUIRED)
cmake_policy(SET CMP0134 NEW) # allow find_package to use the CMAKE_IMPORT_FILE_VERSION variable
find_package(Catch2 CONFIG)
if (NOT Catch2_FOUND)
message(NOTICE "Catch2 not found or is not compatible.")
return()
endif ()
message("catch2 is ${Catch2_CONFIG}")

add_executable(all_tests
Expand Down
Loading