build: rename LLVM_COMPONENT_DEPENDS

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

View File

@@ -642,7 +642,7 @@ endfunction()
# [LINK_LIBRARIES dep1 ...]
# [FRAMEWORK_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
# [LLVM_COMPONENT_DEPENDS comp1 ...]
# [LLVM_LINK_COMPONENTS comp1 ...]
# [C_COMPILE_FLAGS flag1...]
# [SWIFT_COMPILE_FLAGS flag1...]
# [LINK_FLAGS flag1...]
@@ -688,7 +688,7 @@ endfunction()
# FRAMEWORK_DEPENDS_WEAK
# System frameworks this library depends on that should be weakly-linked.
#
# LLVM_COMPONENT_DEPENDS
# LLVM_LINK_COMPONENTS
# LLVM components this library depends on.
#
# C_COMPILE_FLAGS
@@ -753,7 +753,7 @@ function(_add_swift_library_single target name)
INTERFACE_LINK_LIBRARIES
LINK_FLAGS
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS
LLVM_LINK_COMPONENTS
PRIVATE_LINK_LIBRARIES
SWIFT_COMPILE_FLAGS)
@@ -1190,7 +1190,7 @@ function(_add_swift_library_single target name)
if(NOT SWIFTLIB_SINGLE_TARGET_LIBRARY)
# 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()
# Collect compile and link flags for the static and non-static targets.
@@ -1376,7 +1376,7 @@ endfunction()
# add_swift_host_library(name
# [SHARED]
# [STATIC]
# [LLVM_COMPONENT_DEPENDS comp1 ...]
# [LLVM_LINK_COMPONENTS comp1 ...]
# [FILE_DEPENDS target1 ...]
# source1 [source2 source3 ...])
#
@@ -1389,7 +1389,7 @@ endfunction()
# STATIC
# Build a static library.
#
# LLVM_COMPONENT_DEPENDS
# LLVM_LINK_COMPONENTS
# LLVM components this library depends on.
#
# FILE_DEPENDS
@@ -1409,7 +1409,7 @@ function(add_swift_host_library name)
FILE_DEPENDS
INTERFACE_LINK_LIBRARIES
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS)
LLVM_LINK_COMPONENTS)
cmake_parse_arguments(ASHL
"${options}"
@@ -1446,7 +1446,7 @@ function(add_swift_host_library name)
${ASHL_FORCE_BUILD_OPTIMIZED_keyword}
SDK ${SWIFT_HOST_VARIANT_SDK}
ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
LLVM_COMPONENT_DEPENDS ${ASHL_LLVM_COMPONENT_DEPENDS}
LLVM_LINK_COMPONENTS ${ASHL_LLVM_LINK_COMPONENTS}
FILE_DEPENDS ${ASHL_FILE_DEPENDS}
INSTALL_IN_COMPONENT "dev"
)
@@ -1482,7 +1482,7 @@ endfunction()
# [SWIFT_MODULE_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS dep1 ...]
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
# [LLVM_COMPONENT_DEPENDS comp1 ...]
# [LLVM_LINK_COMPONENTS comp1 ...]
# [FILE_DEPENDS target1 ...]
# [TARGET_SDKS sdk1...]
# [C_COMPILE_FLAGS flag1...]
@@ -1548,7 +1548,7 @@ endfunction()
# FRAMEWORK_DEPENDS_WEAK
# System frameworks this library depends on that should be weak-linked
#
# LLVM_COMPONENT_DEPENDS
# LLVM_LINK_COMPONENTS
# LLVM components this library depends on.
#
# FILE_DEPENDS
@@ -1634,7 +1634,7 @@ function(add_swift_target_library name)
INTERFACE_LINK_LIBRARIES
LINK_FLAGS
LINK_LIBRARIES
LLVM_COMPONENT_DEPENDS
LLVM_LINK_COMPONENTS
PRIVATE_LINK_LIBRARIES
SWIFT_COMPILE_FLAGS
SWIFT_COMPILE_FLAGS_IOS
@@ -1906,7 +1906,7 @@ function(add_swift_target_library name)
LINK_LIBRARIES ${swiftlib_link_libraries}
FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened}
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}
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}
@@ -2122,7 +2122,7 @@ function(_add_swift_executable_single name)
cmake_parse_arguments(SWIFTEXE_SINGLE
"EXCLUDE_FROM_ALL"
"SDK;ARCHITECTURE"
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;COMPILE_FLAGS"
"DEPENDS;LLVM_LINK_COMPONENTS;LINK_LIBRARIES;COMPILE_FLAGS"
${ARGN})
set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})
@@ -2223,7 +2223,7 @@ function(_add_swift_executable_single name)
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
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")
endfunction()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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})

View File

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

View File

@@ -7,7 +7,7 @@ endif()
add_sourcekit_executable(complete-test
complete-test.cpp
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)
target_link_libraries(complete-test PRIVATE dispatch BlocksRuntime)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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