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

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

@@ -89,7 +89,7 @@ endfunction()
# add_sourcekit_library(name # Name of the library
# [LINK_LIBS dep1 ...] # Libraries this library will be linked with
# [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.
# [SHARED]
# source1 [source2 source3 ...]) # Sources to add into this library
@@ -97,7 +97,7 @@ macro(add_sourcekit_library name)
cmake_parse_arguments(SOURCEKITLIB
"SHARED"
"INSTALL_IN_COMPONENT"
"HEADERS;LINK_LIBS;DEPENDS;LLVM_COMPONENT_DEPENDS"
"HEADERS;LINK_LIBS;DEPENDS;LLVM_LINK_COMPONENTS"
${ARGN})
set(srcs ${SOURCEKITLIB_UNPARSED_ARGUMENTS})
@@ -161,7 +161,7 @@ macro(add_sourcekit_library name)
target_link_libraries("${name}" INTERFACE ${SOURCEKITLIB_LINK_LIBS})
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)
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -205,7 +205,7 @@ endmacro()
# Usage:
# add_sourcekit_executable(name # Name of the executable
# [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
# [EXCLUDE_FROM_ALL] # Whether to exclude this executable from
# # the ALL_BUILD target
@@ -214,7 +214,7 @@ macro(add_sourcekit_executable name)
cmake_parse_arguments(SOURCEKITEXE
"EXCLUDE_FROM_ALL"
""
"LINK_LIBS;LLVM_COMPONENT_DEPENDS"
"LINK_LIBS;LLVM_LINK_COMPONENTS"
${ARGN})
if (${SOURCEKITEXE_EXCLUDE_FROM_ALL})
@@ -233,7 +233,7 @@ macro(add_sourcekit_executable name)
endif()
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})
set_target_properties(${name} PROPERTIES FOLDER "SourceKit executables")
@@ -256,13 +256,13 @@ endmacro()
# Usage:
# add_sourcekit_framework(name # Name of the framework
# [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
# [INSTALL_IN_COMPONENT comp] # The Swift installation component that this framework belongs to.
# source1 [source2 source3 ...]) # Sources to add into this framework
macro(add_sourcekit_framework name)
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(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -305,7 +305,7 @@ macro(add_sourcekit_framework name)
endif(LLVM_COMMON_DEPENDS)
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)
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -375,10 +375,10 @@ endmacro(add_sourcekit_framework)
# Usage:
# add_sourcekit_xpc_service(name # Name of the XPC service
# [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
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(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -420,7 +420,7 @@ macro(add_sourcekit_xpc_service name framework_target)
endif(LLVM_COMMON_DEPENDS)
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})
add_dependencies(${framework_target} ${name})