Skip to content

Commit d697422

Browse files
committed
Fix feedback the CMake setup.
1 parent b3a3d01 commit d697422

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,27 +346,22 @@ add_swift_library(FoundationNetworking
346346
${CMAKE_C_COMPILER_TARGET}
347347
CFLAGS
348348
${MSVCRT_C_FLAGS}
349-
${deployment_target}
350-
${deployment_enable_libdispatch}
351349
-F${CMAKE_CURRENT_BINARY_DIR}
352350
LINK_FLAGS
353351
${MSVCRT_LINK_FLAGS}
354352
-L${CMAKE_CURRENT_BINARY_DIR}
355-
${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY}
356353
${libdispatch_ldflags}
357354
-lFoundation
358355
${Foundation_INTERFACE_LIBRARIES}
359-
${CFURLSessionInterface_LIBRARIES}
356+
${CFURLSessionInterface_LIBRARIES}
360357
${CURL_LIBRARIES}
361358
${Foundation_RPATH}
362359
${WORKAROUND_SR9138}
363360
${WORKAROUND_SR9995}
364-
$<$<PLATFORM_ID:Windows>:$<TARGET_OBJECTS:CoreFoundationResources>>
365361
SWIFT_FLAGS
366362
-DDEPLOYMENT_RUNTIME_SWIFT
367-
-DNS_BUILDING_FOUNDATION_NETWORKING
363+
-DNS_BUILDING_FOUNDATION_NETWORKING
368364
${deployment_enable_libdispatch}
369-
-I;${ICU_INCLUDE_DIR}
370365
-I;${CMAKE_CURRENT_BINARY_DIR}/swift
371366
${libdispatch_cflags}
372367
${swift_enable_testing}

CoreFoundation/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -543,18 +543,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
543543
target_link_libraries(CoreFoundation
544544
PRIVATE
545545
log)
546-
target_link_libraries(CFURLSessionInterface
547-
PRIVATE
548-
log)
549546
endif()
550547
target_link_libraries(CoreFoundation
551548
PRIVATE
552549
Threads::Threads
553550
${CMAKE_DL_LIBS})
554-
target_link_libraries(CFURLSessionInterface
555-
PRIVATE
556-
Threads::Threads
557-
${CMAKE_DL_LIBS})
558551
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
559552
target_link_libraries(CoreFoundation
560553
PRIVATE
@@ -593,9 +586,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
593586
set_target_properties(CoreFoundation
594587
PROPERTIES LINK_FLAGS
595588
-Xlinker;-alias_list;-Xlinker;Base.subproj/DarwinSymbolAliases;-twolevel_namespace;-sectcreate;__UNICODE;__csbitmaps;CharacterSets/CFCharacterSetBitmaps.bitmap;-sectcreate;__UNICODE;__properties;CharacterSets/CFUniCharPropertyDatabase.data;-sectcreate;__UNICODE;__data;CharacterSets/CFUnicodeData-L.mapping;-segprot;__UNICODE;r;r)
596-
set_target_properties(CFURLSessionInterface
597-
PROPERTIES LINK_FLAGS
598-
-Xlinker;-alias_list;-Xlinker;Base.subproj/DarwinSymbolAliases;-twolevel_namespace;-sectcreate;__UNICODE;__csbitmaps;CharacterSets/CFCharacterSetBitmaps.bitmap;-sectcreate;__UNICODE;__properties;CharacterSets/CFUniCharPropertyDatabase.data;-sectcreate;__UNICODE;__data;CharacterSets/CFUnicodeData-L.mapping;-segprot;__UNICODE;r;r)
599589
endif()
600590

601591
install(TARGETS

0 commit comments

Comments
 (0)