Skip to content

Commit a38301c

Browse files
committed
changes to make ssl work on windows
1 parent 8463e00 commit a38301c

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

.github/workflows/common.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ on:
2727

2828
env:
2929
CMAKE_MULTIBUILD_CONFIG: "${{ startsWith(inputs.os, 'windows') && '--config Debug' || '' }}"
30-
CMAKE_GIT_EXCLUDE: "${{ startsWith(inputs.os, 'windows') && '-DGIT=OFF' || '' }}"
3130

3231
jobs:
3332
build-all:
@@ -115,7 +114,7 @@ jobs:
115114
run: |
116115
mkdir -p build
117116
cd build
118-
cmake ${{ env.CMAKE_GIT_EXCLUDE }} ..
117+
cmake ..
119118
120119
- name: Build C API
121120
working-directory: ./build

c/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ if(BUILD_SHARED_LIBS)
113113
# These libraries are required to be linked under Windows platform as
114114
# they are dependencies of the Rust standard library.
115115
# See https://doc.rust-lang.org/reference/linkage.html#r-link.staticlib
116-
target_link_libraries(hyperonc-shared INTERFACE wsock32 ws2_32 userenv ntdll bcrypt)
116+
target_link_libraries(hyperonc-shared INTERFACE wsock32 ws2_32 userenv ntdll bcrypt winhttp Rpcrt4)
117117
endif(WIN32)
118118
if(GIT)
119119
target_link_libraries(hyperonc-shared INTERFACE OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)

c/conanfile.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[requires]
22
libcheck/0.15.2
3+
openssl/3.4.1
34

45
[generators]
56
CMakeDeps

c/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
find_package(check REQUIRED)
1+
find_package(Check REQUIRED)
22

33
set(TEST_SOURCES
44
test.c

python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if(APPLE)
5050
target_link_libraries(hyperonpy PRIVATE "-framework CoreFoundation" "-framework Security")
5151
endif()
5252
if(WIN32)
53-
target_link_libraries(hyperonpy PRIVATE wsock32 ws2_32 userenv ntdll bcrypt)
53+
target_link_libraries(hyperonpy PRIVATE wsock32 ws2_32 userenv ntdll bcrypt winhttp Rpcrt4)
5454
endif()
5555
if(GIT)
5656
target_link_libraries(hyperonpy PRIVATE OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)

python/conanfile.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[requires]
22
pybind11/2.10.1
33
optional-lite/3.5.0
4+
openssl/3.4.1
45

56
[generators]
67
CMakeDeps

0 commit comments

Comments
 (0)