File tree Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -108,21 +108,28 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
108
108
elseif (CMAKE_SYSTEM_NAME STREQUAL Windows )
109
109
set (deployment_target -DDEPLOYMENT_TARGET_WINDOWS )
110
110
# FIXME(compnerd) these are not all CoreFoundation dependencies, some of them
111
- # are Foundation's. We should split them up accordingly.
111
+ # are Foundation's and others are libcurl's. We should split them up
112
+ # accordingly.
112
113
set (CoreFoundation_INTERFACE_LIBRARIES
113
114
-lAdvAPI32
115
+ -lCrypt32
114
116
-lDbgHelp
115
117
-lShell32
116
118
-lOle32
117
119
-lRpcRT4
118
120
-lSecur32
119
121
-lShLwApi
120
122
-lUser32
123
+ -lWldap32
121
124
-lWS2_32
122
125
-liphlpapi
126
+ -lmincore
127
+ -lnormaliz
123
128
-lpathcch
124
129
-lucrt
125
130
-lshell32 )
131
+ set (WORKAROUND_SR9138 -Xlinker;-ignore:4217 )
132
+ set (WORKAROUND_MTMD -Xlinker;-nodefaultlib:libcmt )
126
133
endif ()
127
134
128
135
add_swift_library (Foundation
@@ -313,6 +320,8 @@ add_swift_library(Foundation
313
320
-luuid
314
321
${Foundation_RPATH}
315
322
${CoreFoundation_INTERFACE_LIBRARIES}
323
+ ${WORKAROUND_SR9138}
324
+ ${WORKAROUND_MTMD}
316
325
SWIFT_FLAGS
317
326
-DDEPLOYMENT_RUNTIME_SWIFT
318
327
${deployment_enable_libdispatch}
@@ -347,7 +356,8 @@ add_swift_executable(plutil
347
356
-L${CMAKE_CURRENT_BINARY_DIR}
348
357
-lFoundation
349
358
${Foundation_INTERFACE_LIBRARIES}
350
- -Xlinker;-rpath;-Xlinker; "\\\$\$ ORIGIN/../lib/swift/${swift_os} "
359
+ ${Foundation_RPATH}
360
+ ${WORKAROUND_MTMD}
351
361
SWIFT_FLAGS
352
362
-DDEPLOYMENT_RUNTIME_SWIFT
353
363
${deployment_enable_libdispatch}
Original file line number Diff line number Diff line change @@ -339,6 +339,9 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
339
339
PRIVATE
340
340
-D_WINDLL )
341
341
endif ()
342
+ target_compile_definitions (CoreFoundation
343
+ PRIVATE
344
+ -DCURL_STATICLIB )
342
345
endif ()
343
346
target_compile_definitions (CoreFoundation
344
347
PRIVATE
You can’t perform that action at this time.
0 commit comments