File tree Expand file tree Collapse file tree 2 files changed +19
-12
lines changed Expand file tree Collapse file tree 2 files changed +19
-12
lines changed Original file line number Diff line number Diff line change 33
33
34
34
build-and-test-windows :
35
35
# if: false # Temporarily disable
36
- name : Build And Test Windows
37
- runs-on : windows-latest
36
+ name : Build And Test Windows ${{ matrix.os-version }} ${{ matrix.crypto }}
37
+ runs-on : windows-${{ matrix.os-version }}
38
+ strategy :
39
+ fail-fast : false
40
+ matrix :
41
+ os-version : [2019, 2022]
42
+ crypto : [OpenSSL, BCrypt]
38
43
env :
39
44
VCPKG_ROOT : ${{ github.workspace }}/vcpkg
40
45
steps :
65
70
run : |
66
71
mkdir build
67
72
cd build
68
- cmake -S .. -G Ninja -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
73
+ cmake -S .. -G Ninja -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DUSE_CRYPTO=${{matrix.crypto}}
69
74
shell : cmd
70
75
71
76
# Mark all directories as safe so checkouts performed in CMakeLists.txt don't cause "unsafe repository" errors.
Original file line number Diff line number Diff line change @@ -84,15 +84,17 @@ if (WIN32)
84
84
string (REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " )
85
85
string (REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} " )
86
86
87
- #
88
- # Check whether BCrypt can be used with this SDK version
89
- #
90
- cmake_push_check_state ()
91
- set (CMAKE_REQUIRED_LIBRARIES bcrypt )
92
- check_symbol_exists (BCryptEncrypt windows.h BCRYPT_AVAILABLE )
93
- cmake_pop_check_state ()
94
- if (NOT BCRYPT_AVAILABLE AND USE_CRYPTO STREQUAL "BCrypt" )
95
- message (FATAL_ERROR "You're on Windows but BCrypt seems to be unavailable, you will need OpenSSL" )
87
+ if (USE_CRYPTO STREQUAL "BCrypt" )
88
+ #
89
+ # Check whether BCrypt can be used with this SDK version
90
+ #
91
+ cmake_push_check_state ()
92
+ set (CMAKE_REQUIRED_LIBRARIES bcrypt )
93
+ check_symbol_exists (BCryptEncrypt windows.h BCRYPT_AVAILABLE )
94
+ cmake_pop_check_state ()
95
+ if (NOT BCRYPT_AVAILABLE )
96
+ message (FATAL_ERROR "You're on Windows but BCrypt seems to be unavailable, you will need OpenSSL" )
97
+ endif ()
96
98
endif ()
97
99
endif ()
98
100
You can’t perform that action at this time.
0 commit comments