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

build: rename LLVM_COMPONENT_DEPENDS

Browse Source 
This is not a target dependency but a target link.  Name the parameter
to be less misleading.  This also makes the name identical to the LLVM
parameter.
This commit is contained in:
Saleem Abdulrasool
2019-05-04 18:20:48 -07:00
parent 5043ed45d9
commit 218b37e1bb
24 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/modules/AddSwift.cmake
View File

@@ -642,7 +642,7 @@ endfunction()
# [LINK_LIBRARIES dep1 ...] # [LINK_LIBRARIES dep1 ...]
# [FRAMEWORK_DEPENDS dep1 ...] # [FRAMEWORK_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS_WEAK dep1 ...] # [FRAMEWORK_DEPENDS_WEAK dep1 ...]
# [LLVM_COMPONENT_DEPENDS comp1 ...] # [LLVM_LINK_COMPONENTS comp1 ...]
# [C_COMPILE_FLAGS flag1...] # [C_COMPILE_FLAGS flag1...]
# [SWIFT_COMPILE_FLAGS flag1...] # [SWIFT_COMPILE_FLAGS flag1...]
# [LINK_FLAGS flag1...] # [LINK_FLAGS flag1...]
@@ -688,7 +688,7 @@ endfunction()
# FRAMEWORK_DEPENDS_WEAK # FRAMEWORK_DEPENDS_WEAK
# System frameworks this library depends on that should be weakly-linked. # System frameworks this library depends on that should be weakly-linked.
# #
# LLVM_COMPONENT_DEPENDS # LLVM_LINK_COMPONENTS
# LLVM components this library depends on. # LLVM components this library depends on.
# #
# C_COMPILE_FLAGS # C_COMPILE_FLAGS
@@ -753,7 +753,7 @@ function(_add_swift_library_single target name)
INTERFACE_LINK_LIBRARIES INTERFACE_LINK_LIBRARIES
LINK_FLAGS LINK_FLAGS
LINK_LIBRARIES LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
PRIVATE_LINK_LIBRARIES PRIVATE_LINK_LIBRARIES
SWIFT_COMPILE_FLAGS) SWIFT_COMPILE_FLAGS)
@@ -1190,7 +1190,7 @@ function(_add_swift_library_single target name)
if(NOT SWIFTLIB_SINGLE_TARGET_LIBRARY) if(NOT SWIFTLIB_SINGLE_TARGET_LIBRARY)
# Call llvm_config() only for libraries that are part of the compiler. # Call llvm_config() only for libraries that are part of the compiler.
swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_LLVM_LINK_COMPONENTS})
endif() endif()
# Collect compile and link flags for the static and non-static targets. # Collect compile and link flags for the static and non-static targets.
@@ -1376,7 +1376,7 @@ endfunction()
# add_swift_host_library(name # add_swift_host_library(name
# [SHARED] # [SHARED]
# [STATIC] # [STATIC]
# [LLVM_COMPONENT_DEPENDS comp1 ...] # [LLVM_LINK_COMPONENTS comp1 ...]
# [FILE_DEPENDS target1 ...] # [FILE_DEPENDS target1 ...]
# source1 [source2 source3 ...]) # source1 [source2 source3 ...])
# #
@@ -1389,7 +1389,7 @@ endfunction()
# STATIC # STATIC
# Build a static library. # Build a static library.
# #
# LLVM_COMPONENT_DEPENDS # LLVM_LINK_COMPONENTS
# LLVM components this library depends on. # LLVM components this library depends on.
# #
# FILE_DEPENDS # FILE_DEPENDS
@@ -1409,7 +1409,7 @@ function(add_swift_host_library name)
FILE_DEPENDS FILE_DEPENDS
INTERFACE_LINK_LIBRARIES INTERFACE_LINK_LIBRARIES
LINK_LIBRARIES LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS) LLVM_LINK_COMPONENTS)
cmake_parse_arguments(ASHL cmake_parse_arguments(ASHL
"${options}" "${options}"
@@ -1446,7 +1446,7 @@ function(add_swift_host_library name)
${ASHL_FORCE_BUILD_OPTIMIZED_keyword} ${ASHL_FORCE_BUILD_OPTIMIZED_keyword}
SDK ${SWIFT_HOST_VARIANT_SDK} SDK ${SWIFT_HOST_VARIANT_SDK}
ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH} ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS} LLVM_LINK_COMPONENTS ${ASHL_LLVM_LINK_COMPONENTS}
FILE_DEPENDS ${ASHL_FILE_DEPENDS} FILE_DEPENDS ${ASHL_FILE_DEPENDS}
INSTALL_IN_COMPONENT "dev" INSTALL_IN_COMPONENT "dev"
) )
@@ -1482,7 +1482,7 @@ endfunction()
# [SWIFT_MODULE_DEPENDS dep1 ...] # [SWIFT_MODULE_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS dep1 ...] # [FRAMEWORK_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS_WEAK dep1 ...] # [FRAMEWORK_DEPENDS_WEAK dep1 ...]
# [LLVM_COMPONENT_DEPENDS comp1 ...] # [LLVM_LINK_COMPONENTS comp1 ...]
# [FILE_DEPENDS target1 ...] # [FILE_DEPENDS target1 ...]
# [TARGET_SDKS sdk1...] # [TARGET_SDKS sdk1...]
# [C_COMPILE_FLAGS flag1...] # [C_COMPILE_FLAGS flag1...]
@@ -1548,7 +1548,7 @@ endfunction()
# FRAMEWORK_DEPENDS_WEAK # FRAMEWORK_DEPENDS_WEAK
# System frameworks this library depends on that should be weak-linked # System frameworks this library depends on that should be weak-linked
# #
# LLVM_COMPONENT_DEPENDS # LLVM_LINK_COMPONENTS
# LLVM components this library depends on. # LLVM components this library depends on.
# #
# FILE_DEPENDS # FILE_DEPENDS
@@ -1634,7 +1634,7 @@ function(add_swift_target_library name)
INTERFACE_LINK_LIBRARIES INTERFACE_LINK_LIBRARIES
LINK_FLAGS LINK_FLAGS
LINK_LIBRARIES LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
PRIVATE_LINK_LIBRARIES PRIVATE_LINK_LIBRARIES
SWIFT_COMPILE_FLAGS SWIFT_COMPILE_FLAGS
SWIFT_COMPILE_FLAGS_IOS SWIFT_COMPILE_FLAGS_IOS
@@ -1906,7 +1906,7 @@ function(add_swift_target_library name)
LINK_LIBRARIES ${swiftlib_link_libraries} LINK_LIBRARIES ${swiftlib_link_libraries}
FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened} FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened}
FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK} FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
LLVM_COMPONENT_DEPENDS ${SWIFTLIB_LLVM_COMPONENT_DEPENDS} LLVM_LINK_COMPONENTS ${SWIFTLIB_LLVM_LINK_COMPONENTS}
FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets} FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
C_COMPILE_FLAGS ${swiftlib_c_compile_flags_all} C_COMPILE_FLAGS ${swiftlib_c_compile_flags_all}
SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all} ${swiftlib_swift_compile_flags_arch} ${swiftlib_swift_compile_private_frameworks_flag} SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all} ${swiftlib_swift_compile_flags_arch} ${swiftlib_swift_compile_private_frameworks_flag}
@@ -2122,7 +2122,7 @@ function(_add_swift_executable_single name)
cmake_parse_arguments(SWIFTEXE_SINGLE cmake_parse_arguments(SWIFTEXE_SINGLE
"EXCLUDE_FROM_ALL" "EXCLUDE_FROM_ALL"
"SDK;ARCHITECTURE" "SDK;ARCHITECTURE"
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;COMPILE_FLAGS" "DEPENDS;LLVM_LINK_COMPONENTS;LINK_LIBRARIES;COMPILE_FLAGS"
${ARGN}) ${ARGN})
set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS}) set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})
@@ -2223,7 +2223,7 @@ function(_add_swift_executable_single name)
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR}) LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES}) target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
set_target_properties(${name} PROPERTIES FOLDER "Swift executables") set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
endfunction() endfunction()

8
lib/AST/CMakeLists.txt
View File

@@ -4,9 +4,9 @@ if (SWIFT_FORCE_OPTIMIZED_TYPECHECKER)
endif() endif()
if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB) if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
set(SWIFTAST_LLVM_COMPONENT_DEPENDS) set(SWIFTAST_LLVM_LINK_COMPONENTS)
else() else()
set(SWIFTAST_LLVM_COMPONENT_DEPENDS set(SWIFTAST_LLVM_LINK_COMPONENTS
bitreader bitwriter coroutines coverage irreader debuginfoDWARF bitreader bitwriter coroutines coverage irreader debuginfoDWARF
profiledata instrumentation object objcarcopts mc mcparser profiledata instrumentation object objcarcopts mc mcparser
bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD} bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}
@@ -75,8 +75,8 @@ add_swift_host_library(swiftAST STATIC
UnqualifiedLookup.cpp UnqualifiedLookup.cpp
USRGeneration.cpp USRGeneration.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
${SWIFTAST_LLVM_COMPONENT_DEPENDS} ${SWIFTAST_LLVM_LINK_COMPONENTS}
${EXTRA_AST_FLAGS} ${EXTRA_AST_FLAGS}
) )

2
lib/ASTSectionImporter/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_host_library(swiftASTSectionImporter STATIC add_swift_host_library(swiftASTSectionImporter STATIC
ASTSectionImporter.cpp ASTSectionImporter.cpp
LLVM_COMPONENT_DEPENDS core) LLVM_LINK_COMPONENTS core)
target_link_libraries(swiftASTSectionImporter PRIVATE target_link_libraries(swiftASTSectionImporter PRIVATE
swiftBasic) swiftBasic)

2
lib/Basic/CMakeLists.txt
View File

@@ -105,7 +105,7 @@ add_swift_host_library(swiftBasic STATIC
GYB_SOURCES GYB_SOURCES
UnicodeExtendedGraphemeClusters.cpp.gyb UnicodeExtendedGraphemeClusters.cpp.gyb
LLVM_COMPONENT_DEPENDS support) LLVM_LINK_COMPONENTS support)
target_include_directories(swiftBasic PRIVATE target_include_directories(swiftBasic PRIVATE
${UUID_INCLUDE}) ${UUID_INCLUDE})

2
lib/IRGen/CMakeLists.txt
View File

@@ -51,7 +51,7 @@ add_swift_host_library(swiftIRGen STATIC
TypeLayoutDumper.cpp TypeLayoutDumper.cpp
TypeLayoutVerifier.cpp TypeLayoutVerifier.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
target target
transformutils transformutils
) )

2
lib/Immediate/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_swift_host_library(swiftImmediate STATIC add_swift_host_library(swiftImmediate STATIC
Immediate.cpp Immediate.cpp
REPL.cpp REPL.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
executionengine executionengine
linker linker
mcjit mcjit

2
lib/LLVMPasses/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ add_swift_host_library(swiftLLVMPasses STATIC
LLVMInlineTree.cpp LLVMInlineTree.cpp
LLVMMergeFunctions.cpp LLVMMergeFunctions.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
analysis analysis
) )

2
lib/TBDGen/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ add_subdirectory(tapi)
add_swift_host_library(swiftTBDGen STATIC add_swift_host_library(swiftTBDGen STATIC
${TAPI_SOURCES} ${TAPI_SOURCES}
TBDGen.cpp TBDGen.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
demangle demangle
) )
target_link_libraries(swiftTBDGen PRIVATE target_link_libraries(swiftTBDGen PRIVATE

4
stdlib/cmake/modules/AddSwiftStdlib.cmake
View File

@@ -10,7 +10,7 @@ function(add_swift_target_executable name)
cmake_parse_arguments(SWIFTEXE_TARGET cmake_parse_arguments(SWIFTEXE_TARGET
"EXCLUDE_FROM_ALL;;BUILD_WITH_STDLIB" "EXCLUDE_FROM_ALL;;BUILD_WITH_STDLIB"
"" ""
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES" "DEPENDS;LLVM_LINK_COMPONENTS;LINK_LIBRARIES"
${ARGN}) ${ARGN})
set(SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS}) set(SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS})
@@ -56,7 +56,7 @@ function(add_swift_target_executable name)
${VARIANT_NAME} ${VARIANT_NAME}
${SWIFTEXE_TARGET_SOURCES} ${SWIFTEXE_TARGET_SOURCES}
DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix} DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix}
LLVM_COMPONENT_DEPENDS ${SWIFTEXE_TARGET_LLVM_COMPONENT_DEPENDS} LLVM_LINK_COMPONENTS ${SWIFTEXE_TARGET_LLVM_LINK_COMPONENTS}
SDK "${sdk}" SDK "${sdk}"
ARCHITECTURE "${arch}" ARCHITECTURE "${arch}"
LINK_LIBRARIES ${SWIFTEXE_TARGET_LINK_LIBRARIES} LINK_LIBRARIES ${SWIFTEXE_TARGET_LINK_LIBRARIES}

24
tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
View File

@@ -89,7 +89,7 @@ endfunction()
# add_sourcekit_library(name # Name of the library # add_sourcekit_library(name # Name of the library
# [LINK_LIBS dep1 ...] # Libraries this library will be linked with # [LINK_LIBS dep1 ...] # Libraries this library will be linked with
# [DEPENDS dep1 ...] # Targets this library depends on # [DEPENDS dep1 ...] # Targets this library depends on
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this library depends on # [LLVM_LINK_COMPONENTS comp1 ...] # LLVM components this library depends on
# [INSTALL_IN_COMPONENT comp] # The Swift installation component that this library belongs to. # [INSTALL_IN_COMPONENT comp] # The Swift installation component that this library belongs to.
# [SHARED] # [SHARED]
# source1 [source2 source3 ...]) # Sources to add into this library # source1 [source2 source3 ...]) # Sources to add into this library
@@ -97,7 +97,7 @@ macro(add_sourcekit_library name)
cmake_parse_arguments(SOURCEKITLIB cmake_parse_arguments(SOURCEKITLIB
"SHARED" "SHARED"
"INSTALL_IN_COMPONENT" "INSTALL_IN_COMPONENT"
"HEADERS;LINK_LIBS;DEPENDS;LLVM_COMPONENT_DEPENDS" "HEADERS;LINK_LIBS;DEPENDS;LLVM_LINK_COMPONENTS"
${ARGN}) ${ARGN})
set(srcs ${SOURCEKITLIB_UNPARSED_ARGUMENTS}) set(srcs ${SOURCEKITLIB_UNPARSED_ARGUMENTS})
@@ -161,7 +161,7 @@ macro(add_sourcekit_library name)
target_link_libraries("${name}" INTERFACE ${SOURCEKITLIB_LINK_LIBS}) target_link_libraries("${name}" INTERFACE ${SOURCEKITLIB_LINK_LIBS})
endif() endif()
swift_common_llvm_config(${name} ${SOURCEKITLIB_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config(${name} ${SOURCEKITLIB_LLVM_LINK_COMPONENTS})
if(SOURCEKITLIB_SHARED AND EXPORTED_SYMBOL_FILE) if(SOURCEKITLIB_SHARED AND EXPORTED_SYMBOL_FILE)
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE}) add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -205,7 +205,7 @@ endmacro()
# Usage: # Usage:
# add_sourcekit_executable(name # Name of the executable # add_sourcekit_executable(name # Name of the executable
# [LINK_LIBS dep1 ...] # Libraries this executable depends on # [LINK_LIBS dep1 ...] # Libraries this executable depends on
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this executable # [LLVM_LINK_COMPONENTS comp1 ...] # LLVM components this executable
# # depends on # # depends on
# [EXCLUDE_FROM_ALL] # Whether to exclude this executable from # [EXCLUDE_FROM_ALL] # Whether to exclude this executable from
# # the ALL_BUILD target # # the ALL_BUILD target
@@ -214,7 +214,7 @@ macro(add_sourcekit_executable name)
cmake_parse_arguments(SOURCEKITEXE cmake_parse_arguments(SOURCEKITEXE
"EXCLUDE_FROM_ALL" "EXCLUDE_FROM_ALL"
"" ""
"LINK_LIBS;LLVM_COMPONENT_DEPENDS" "LINK_LIBS;LLVM_LINK_COMPONENTS"
${ARGN}) ${ARGN})
if (${SOURCEKITEXE_EXCLUDE_FROM_ALL}) if (${SOURCEKITEXE_EXCLUDE_FROM_ALL})
@@ -233,7 +233,7 @@ macro(add_sourcekit_executable name)
endif() endif()
target_link_libraries(${name} PRIVATE ${SOURCEKITEXE_LINK_LIBS}) target_link_libraries(${name} PRIVATE ${SOURCEKITEXE_LINK_LIBS})
swift_common_llvm_config(${name} ${SOURCEKITEXE_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config(${name} ${SOURCEKITEXE_LLVM_LINK_COMPONENTS})
target_link_libraries(${name} PRIVATE ${LLVM_COMMON_LIBS}) target_link_libraries(${name} PRIVATE ${LLVM_COMMON_LIBS})
set_target_properties(${name} PROPERTIES FOLDER "SourceKit executables") set_target_properties(${name} PROPERTIES FOLDER "SourceKit executables")
@@ -256,13 +256,13 @@ endmacro()
# Usage: # Usage:
# add_sourcekit_framework(name # Name of the framework # add_sourcekit_framework(name # Name of the framework
# [LINK_LIBS dep1 ...] # Libraries this framework will link with # [LINK_LIBS dep1 ...] # Libraries this framework will link with
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this framework depends on # [LLVM_LINK_COMPONENTS comp1 ...] # LLVM components this framework depends on
# [MODULEMAP modulemap] # Module map file for this framework # [MODULEMAP modulemap] # Module map file for this framework
# [INSTALL_IN_COMPONENT comp] # The Swift installation component that this framework belongs to. # [INSTALL_IN_COMPONENT comp] # The Swift installation component that this framework belongs to.
# source1 [source2 source3 ...]) # Sources to add into this framework # source1 [source2 source3 ...]) # Sources to add into this framework
macro(add_sourcekit_framework name) macro(add_sourcekit_framework name)
cmake_parse_arguments(SOURCEKITFW cmake_parse_arguments(SOURCEKITFW
"" "MODULEMAP;INSTALL_IN_COMPONENT" "LINK_LIBS;LLVM_COMPONENT_DEPENDS" ${ARGN}) "" "MODULEMAP;INSTALL_IN_COMPONENT" "LINK_LIBS;LLVM_LINK_COMPONENTS" ${ARGN})
set(srcs ${SOURCEKITFW_UNPARSED_ARGUMENTS}) set(srcs ${SOURCEKITFW_UNPARSED_ARGUMENTS})
set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}) set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -305,7 +305,7 @@ macro(add_sourcekit_framework name)
endif(LLVM_COMMON_DEPENDS) endif(LLVM_COMMON_DEPENDS)
target_link_libraries(${name} PRIVATE ${SOURCEKITFW_LINK_LIBS}) target_link_libraries(${name} PRIVATE ${SOURCEKITFW_LINK_LIBS})
swift_common_llvm_config(${name} ${SOURCEKITFW_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config(${name} ${SOURCEKITFW_LLVM_LINK_COMPONENTS})
if (EXPORTED_SYMBOL_FILE) if (EXPORTED_SYMBOL_FILE)
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE}) add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -375,10 +375,10 @@ endmacro(add_sourcekit_framework)
# Usage: # Usage:
# add_sourcekit_xpc_service(name # Name of the XPC service # add_sourcekit_xpc_service(name # Name of the XPC service
# [LINK_LIBS dep1 ...] # Libraries this service will link with # [LINK_LIBS dep1 ...] # Libraries this service will link with
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this service depends on # [LLVM_LINK_COMPONENTS comp1 ...] # LLVM components this service depends on
# source1 [source2 source3 ...]) # Sources to add into this service # source1 [source2 source3 ...]) # Sources to add into this service
macro(add_sourcekit_xpc_service name framework_target) macro(add_sourcekit_xpc_service name framework_target)
cmake_parse_arguments(SOURCEKITXPC "" "" "LINK_LIBS;LLVM_COMPONENT_DEPENDS" ${ARGN}) cmake_parse_arguments(SOURCEKITXPC "" "" "LINK_LIBS;LLVM_LINK_COMPONENTS" ${ARGN})
set(srcs ${SOURCEKITXPC_UNPARSED_ARGUMENTS}) set(srcs ${SOURCEKITXPC_UNPARSED_ARGUMENTS})
set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR}) set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -420,7 +420,7 @@ macro(add_sourcekit_xpc_service name framework_target)
endif(LLVM_COMMON_DEPENDS) endif(LLVM_COMMON_DEPENDS)
target_link_libraries(${name} PRIVATE ${SOURCEKITXPC_LINK_LIBS}) target_link_libraries(${name} PRIVATE ${SOURCEKITXPC_LINK_LIBS})
swift_common_llvm_config(${name} ${SOURCEKITXPC_LLVM_COMPONENT_DEPENDS}) swift_common_llvm_config(${name} ${SOURCEKITXPC_LLVM_LINK_COMPONENTS})
target_link_libraries(${name} PRIVATE ${LLVM_COMMON_LIBS}) target_link_libraries(${name} PRIVATE ${LLVM_COMMON_LIBS})
add_dependencies(${framework_target} ${name}) add_dependencies(${framework_target} ${name})

2
tools/SourceKit/lib/SwiftLang/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ add_sourcekit_library(SourceKitSwiftLang
clangAST clangAST
clangAPINotes clangAPINotes
clangBasic clangBasic
LLVM_COMPONENT_DEPENDS ${LLVM_TARGETS_TO_BUILD} LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD}
bitreader bitreader
bitwriter bitwriter
coverage coverage

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

@@ -7,7 +7,7 @@ endif()
add_sourcekit_executable(complete-test add_sourcekit_executable(complete-test
complete-test.cpp complete-test.cpp
LINK_LIBS ${SOURCEKITD_TEST_LINK_LIBS} LINK_LIBS ${SOURCEKITD_TEST_LINK_LIBS}
LLVM_COMPONENT_DEPENDS support option coverage lto LLVM_LINK_COMPONENTS support option coverage lto
) )
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH) if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(complete-test PRIVATE dispatch BlocksRuntime) target_link_libraries(complete-test PRIVATE dispatch BlocksRuntime)

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

@@ -11,7 +11,7 @@ if(HAVE_UNICODE_LIBEDIT)
add_sourcekit_executable(sourcekitd-repl add_sourcekit_executable(sourcekitd-repl
sourcekitd-repl.cpp sourcekitd-repl.cpp
LINK_LIBS ${SOURCEKITD_REPL_LINK_LIBS} edit LINK_LIBS ${SOURCEKITD_REPL_LINK_LIBS} edit
LLVM_COMPONENT_DEPENDS support coverage lto LLVM_LINK_COMPONENTS support coverage lto
) )
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH) if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-repl PRIVATE dispatch BlocksRuntime) target_link_libraries(sourcekitd-repl PRIVATE dispatch BlocksRuntime)

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

@@ -13,7 +13,7 @@ add_sourcekit_executable(sourcekitd-test
TestOptions.cpp TestOptions.cpp
LINK_LIBS ${SOURCEKITD_TEST_LINK_LIBS} SourceKitSupport LINK_LIBS ${SOURCEKITD_TEST_LINK_LIBS} SourceKitSupport
clangRewrite clangLex clangBasic clangRewrite clangLex clangBasic
LLVM_COMPONENT_DEPENDS core support option coverage lto LLVM_LINK_COMPONENTS core support option coverage lto
) )
if(SWIFT_NEED_EXPLICIT_LIBDISPATCH) if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
target_link_libraries(sourcekitd-test PRIVATE dispatch BlocksRuntime) target_link_libraries(sourcekitd-test PRIVATE dispatch BlocksRuntime)

2
tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ option(SOURCEKITD_BUILD_STATIC_INPROC
set(sourcekitdInProc_args set(sourcekitdInProc_args
sourcekitdInProc.cpp sourcekitdInProc.cpp
LINK_LIBS SourceKitSwiftLang sourcekitdAPI LINK_LIBS SourceKitSwiftLang sourcekitdAPI
LLVM_COMPONENT_DEPENDS support coverage LLVM_LINK_COMPONENTS support coverage
) )
if (SOURCEKIT_INSTALLING_INPROC) if (SOURCEKIT_INSTALLING_INPROC)

2
tools/SourceKit/tools/sourcekitd/bin/XPC/Client/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ add_sourcekit_framework(sourcekitd
${public_headers} ${public_headers}
sourcekitd.cpp sourcekitd.cpp
LINK_LIBS sourcekitdAPI LINK_LIBS sourcekitdAPI
LLVM_COMPONENT_DEPENDS support LLVM_LINK_COMPONENTS support
MODULEMAP module.modulemap MODULEMAP module.modulemap
INSTALL_IN_COMPONENT sourcekit-xpc-service INSTALL_IN_COMPONENT sourcekit-xpc-service
) )

2
tools/SourceKit/tools/sourcekitd/bin/XPC/Service/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ if (NOT SOURCEKIT_INSTALLING_INPROC)
add_sourcekit_xpc_service(SourceKitService sourcekitd add_sourcekit_xpc_service(SourceKitService sourcekitd
XPCService.cpp XPCService.cpp
LINK_LIBS SourceKitSwiftLang sourcekitdAPI LINK_LIBS SourceKitSwiftLang sourcekitdAPI
LLVM_COMPONENT_DEPENDS support coverage LLVM_LINK_COMPONENTS support coverage
) )
endif() endif()

2
tools/swift-demangle-fuzzer/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_fuzzer_host_tool(swift-demangle-fuzzer add_swift_fuzzer_host_tool(swift-demangle-fuzzer
swift-demangle-fuzzer.cpp swift-demangle-fuzzer.cpp
LLVM_COMPONENT_DEPENDS support LLVM_LINK_COMPONENTS support
SWIFT_COMPONENT compiler SWIFT_COMPONENT compiler
) )
target_link_libraries(swift-demangle-fuzzer target_link_libraries(swift-demangle-fuzzer

2
tools/swift-demangle-yamldump/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_host_tool(swift-demangle-yamldump add_swift_host_tool(swift-demangle-yamldump
swift-demangle-yamldump.cpp swift-demangle-yamldump.cpp
LLVM_COMPONENT_DEPENDS support LLVM_LINK_COMPONENTS support
SWIFT_COMPONENT tools SWIFT_COMPONENT tools
) )
target_link_libraries(swift-demangle-yamldump target_link_libraries(swift-demangle-yamldump

2
tools/swift-demangle/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_host_tool(swift-demangle add_swift_host_tool(swift-demangle
swift-demangle.cpp swift-demangle.cpp
LLVM_COMPONENT_DEPENDS support LLVM_LINK_COMPONENTS support
SWIFT_COMPONENT compiler SWIFT_COMPONENT compiler
) )
target_link_libraries(swift-demangle target_link_libraries(swift-demangle

2
tools/swift-reflection-dump/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_host_tool(swift-reflection-dump add_swift_host_tool(swift-reflection-dump
swift-reflection-dump.cpp swift-reflection-dump.cpp
LLVM_COMPONENT_DEPENDS object support LLVM_LINK_COMPONENTS object support
SWIFT_COMPONENT tools SWIFT_COMPONENT tools
) )
target_link_libraries(swift-reflection-dump target_link_libraries(swift-reflection-dump

2
tools/swift-reflection-fuzzer/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_fuzzer_host_tool(swift-reflection-fuzzer add_swift_fuzzer_host_tool(swift-reflection-fuzzer
swift-reflection-fuzzer.cpp swift-reflection-fuzzer.cpp
LLVM_COMPONENT_DEPENDS support LLVM_LINK_COMPONENTS support
SWIFT_COMPONENT tools SWIFT_COMPONENT tools
) )
target_link_libraries(swift-reflection-fuzzer target_link_libraries(swift-reflection-fuzzer

2
tools/swift-syntax-parser-test/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ swift_swap_compiler_if_needed("SwiftSyntaxParserTest")
add_swift_host_tool(swift-syntax-parser-test add_swift_host_tool(swift-syntax-parser-test
swift-syntax-parser-test.cpp swift-syntax-parser-test.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
Support Support
SWIFT_COMPONENT tools SWIFT_COMPONENT tools
) )

2
tools/swift-syntax-test/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_swift_host_tool(swift-syntax-test add_swift_host_tool(swift-syntax-test
swift-syntax-test.cpp swift-syntax-test.cpp
LLVM_COMPONENT_DEPENDS LLVM_LINK_COMPONENTS
Support Support
SWIFT_COMPONENT tools SWIFT_COMPONENT tools
) )