8000 Merge pull request #6626 from lazka/fix-win32-openssl · libgit2/libgit2@80efb3a · GitHub
[go: up one dir, main page]
Skip to content

Commit 80efb3a

Browse files
ethomsonethomson
authored
Merge pull request #6626 from lazka/fix-win32-openssl
cmake: fix openssl build on win32
2 parents 8ffdc5a + 8687283 commit 80efb3a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

‎cmake/SelectHTTPSBackend.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ if(USE_HTTPS)
109109
elseif(USE_HTTPS STREQUAL "Schannel")
110110
set(GIT_SCHANNEL 1)
111111

112-
list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32" "secur32")
113-
list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32" "-lsecur32")
112+
list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32")
113+
list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
114114
elseif(USE_HTTPS STREQUAL "WinHTTP")
115115
set(GIT_WINHTTP 1)
116116

@@ -125,8 +125,8 @@ if(USE_HTTPS)
125125
list(APPEND LIBGIT2_PC_LIBS "-lwinhttp")
126126
endif()
127127

128-
list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32" "secur32")
129-
list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcryp 8000 t32" "-lole32" "-lsecur32")
128+
list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32")
129+
list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
130130
elseif(USE_HTTPS STREQUAL "OpenSSL-Dynamic")
131131
set(GIT_OPENSSL 1)
132132
set(GIT_OPENSSL_DYNAMIC 1)

‎src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ endif()
135135
# platform libraries
136136

137137
if(WIN32)
138-
list(APPEND LIBGIT2_SYSTEM_LIBS ws2_32)
138+
list(APPEND LIBGIT2_SYSTEM_LIBS "ws2_32" "secur32")
139+
list(APPEND LIBGIT2_PC_LIBS "-lws2_32" "-lsecur32")
139140
endif()
140141

141142
if(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")

0 commit comments

Comments
 (0)
0