averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28338 from compnerd/explictly-explicit

Browse Source 
build: remove `SWIFT_NEED_EXPLICIT_LIBDISPATCH` (NFC)
This commit is contained in:
Saleem Abdulrasool
2019-11-19 11:46:59 -08:00
committed by GitHub
parent dca30564d0 18570c723f
commit 8a9f53594e
8 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/SourceKit/lib/Support/CMakeLists.txt
View File

@@ -11,7 +11,9 @@ target_link_libraries(SourceKitSupport PRIVATE
swiftSyntax
clangBasic
clangRewrite)
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(SourceKitSupport INTERFACE dispatch BlocksRuntime)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(SourceKitSupport INTERFACE
dispatch
BlocksRuntime)
endif()

6
tools/SourceKit/tools/complete-test/CMakeLists.txt
View File

@@ -7,8 +7,10 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
else()
target_link_libraries(complete-test PRIVATE sourcekitd)
endif()
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(complete-test PRIVATE dispatch BlocksRuntime)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(complete-test PRIVATE
dispatch
BlocksRuntime)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

6
tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
View File

@@ -12,8 +12,10 @@ if(HAVE_UNICODE_LIBEDIT)
else()
target_link_libraries(sourcekitd-repl PRIVATE sourcekitd)
endif()
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-repl PRIVATE dispatch BlocksRuntime)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(sourcekitd-repl PRIVATE
dispatch
BlocksRuntime)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

6
tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
View File

@@ -17,8 +17,10 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
else()
target_link_libraries(sourcekitd-test PRIVATE sourcekitd)
endif()
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-test PRIVATE dispatch BlocksRuntime)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(sourcekitd-test PRIVATE
dispatch
BlocksRuntime)
endif()
add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)