Skip to content

Commit 86d7ae7

Browse files
committed
Build curl with schannel as ssl on windows. Unfortunately, the curl targets now don't properly link against the necessary libraries. Worked around that by not building the proj executables, and by linking WED against these needed libraries manually.
1 parent 1a90750 commit 86d7ae7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmake/WED.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,10 @@ target_link_libraries(WED PRIVATE
532532
if (WIN32)
533533
target_link_libraries(WED PRIVATE
534534
comctl32
535-
)
535+
secur32
536+
crypt32
537+
wldap32
538+
)
536539
elseif (APPLE)
537540
target_link_libraries(WED PRIVATE
538541
${CARBON_FRAMEWORK}

conanfile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ def configure(self):
3636
self.options["libpng"].with_zlib = True
3737
self.options["glew"].shared = False
3838
self.options["glew"].with_glu = "system"
39+
self.options["proj"].build_executables = False
3940

4041
if self.settings.os == "Windows":
41-
self.options["libcurl"].with_ssl = "openssl"
42+
self.options["libcurl"].with_ssl = "schannel"
4243

4344
def layout(self):
4445
cmake_layout(self)

0 commit comments

Comments
 (0)