Skip to content

Commit b3819c6

Browse files
gottesmmgottesmm
authored
[cmake] Rename COMPONENT_DEPENDS to LLVM_COMPONENT_DEPENDS (#4311)
Now that I am going to be adding an IN_SWIFT_COMPONENT argument, I need to do this to distinguish the concepts of an LLVM_COMPONENT and a SWIFT_COMPONENT.
1 parent 714075a commit b3819c6

File tree

16 files changed

+44
-44
lines changed

16 files changed

+44
-44
lines changed

‎cmake/modules/AddSwift.cmake

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ endfunction()
403403
# [LINK_LIBRARIES dep1 ...]
404404
# [FRAMEWORK_DEPENDS dep1 ...]
405405
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
406-
# [COMPONENT_DEPENDS comp1 ...]
406+
# [LLVM_COMPONENT_DEPENDS comp1 ...]
407407
# [C_COMPILE_FLAGS flag1...]
408408
# [SWIFT_COMPILE_FLAGS flag1...]
409409
# [LINK_FLAGS flag1...]
@@ -447,7 +447,7 @@ endfunction()
447447
# FRAMEWORK_DEPENDS_WEAK
448448
# System frameworks this library depends on that should be weakly-linked.
449449
#
450-
# COMPONENT_DEPENDS
450+
# LLVM_COMPONENT_DEPENDS
451451
# LLVM components this library depends on.
452452
#
453453
# C_COMPILE_FLAGS
@@ -493,7 +493,7 @@ function(_add_swift_library_single target name)
493493
cmake_parse_arguments(SWIFTLIB_SINGLE
494494
"${SWIFTLIB_SINGLE_options}"
495495
"SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_IOS"
496-
"DEPENDS;LINK_LIBRARIES;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;COMPONENT_DEPENDS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES;FILE_DEPENDS"
496+
"DEPENDS;LINK_LIBRARIES;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;LLVM_COMPONENT_DEPENDS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES;FILE_DEPENDS"
497497
${ARGN})
498498

499499
set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_UNPARSED_ARGUMENTS})
@@ -888,7 +888,7 @@ function(_add_swift_library_single target name)
888888

889889
if(NOT SWIFTLIB_SINGLE_TARGET_LIBRARY)
890890
# Call llvm_config() only for libraries that are part of the compiler.
891-
swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_COMPONENT_DEPENDS})
891+
swift_common_llvm_config("${target}" ${SWIFTLIB_SINGLE_LLVM_COMPONENT_DEPENDS})
892892
endif()
893893

894894
# Collect compile and link flags for the static and non-static targets.
@@ -1054,7 +1054,7 @@ endfunction()
10541054
# [SWIFT_MODULE_DEPENDS dep1 ...]
10551055
# [FRAMEWORK_DEPENDS dep1 ...]
10561056
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
1057-
# [COMPONENT_DEPENDS comp1 ...]
1057+
# [LLVM_COMPONENT_DEPENDS comp1 ...]
10581058
# [FILE_DEPENDS target1 ...]
10591059
# [TARGET_SDKS sdk1...]
10601060
# [C_COMPILE_FLAGS flag1...]
@@ -1113,7 +1113,7 @@ endfunction()
11131113
# FRAMEWORK_DEPENDS_WEAK
11141114
# System frameworks this library depends on that should be weak-linked
11151115
#
1116-
# COMPONENT_DEPENDS
1116+
# LLVM_COMPONENT_DEPENDS
11171117
# LLVM components this library depends on.
11181118
#
11191119
# FILE_DEPENDS
@@ -1171,7 +1171,7 @@ function(add_swift_library name)
11711171
cmake_parse_arguments(SWIFTLIB
11721172
"${SWIFTLIB_options}"
11731173
"INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_IOS"
1174-
"DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;SWIFT_MODULE_DEPENDS_FREEBSD;SWIFT_MODULE_DEPENDS_LINUX;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES"
1174+
"DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;SWIFT_MODULE_DEPENDS_FREEBSD;SWIFT_MODULE_DEPENDS_LINUX;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;LLVM_COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES"
11751175
${ARGN})
11761176
set(SWIFTLIB_SOURCES ${SWIFTLIB_UNPARSED_ARGUMENTS})
11771177

@@ -1369,7 +1369,7 @@ function(add_swift_library name)
13691369
LINK_LIBRARIES ${swiftlib_link_libraries}
13701370
FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened}
13711371
FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
1372-
COMPONENT_DEPENDS ${SWIFTLIB_COMPONENT_DEPENDS}
1372+
LLVM_COMPONENT_DEPENDS ${SWIFTLIB_LLVM_COMPONENT_DEPENDS}
13731373
FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
13741374
C_COMPILE_FLAGS ${SWIFTLIB_C_COMPILE_FLAGS}
13751375
SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all}
@@ -1557,7 +1557,7 @@ function(add_swift_library name)
15571557
LINK_LIBRARIES ${SWIFTLIB_LINK_LIBRARIES}
15581558
FRAMEWORK_DEPENDS ${SWIFTLIB_FRAMEWORK_DEPENDS}
15591559
FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
1560-
COMPONENT_DEPENDS ${SWIFTLIB_COMPONENT_DEPENDS}
1560+
LLVM_COMPONENT_DEPENDS ${SWIFTLIB_LLVM_COMPONENT_DEPENDS}
15611561
FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS}
15621562
C_COMPILE_FLAGS ${SWIFTLIB_C_COMPILE_FLAGS}
15631563
SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all}
@@ -1597,7 +1597,7 @@ function(_add_swift_executable_single name)
15971597
cmake_parse_arguments(SWIFTEXE_SINGLE
15981598
"EXCLUDE_FROM_ALL;DONT_STRIP_NON_MAIN_SYMBOLS;DISABLE_ASLR"
15991599
"SDK;ARCHITECTURE"
1600-
"DEPENDS;COMPONENT_DEPENDS;LINK_LIBRARIES;LINK_FAT_LIBRARIES"
1600+
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES;LINK_FAT_LIBRARIES"
16011601
${ARGN})
16021602

16031603
set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})
@@ -1710,7 +1710,7 @@ function(_add_swift_executable_single name)
17101710
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR})
17111711

17121712
target_link_libraries("${name}" ${SWIFTEXE_SINGLE_LINK_LIBRARIES} ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES})
1713-
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_COMPONENT_DEPENDS})
1713+
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_COMPONENT_DEPENDS})
17141714

17151715
set_target_properties(${name}
17161716
PROPERTIES FOLDER "Swift executables")
@@ -1729,7 +1729,7 @@ function(add_swift_target_executable name)
17291729
cmake_parse_arguments(SWIFTEXE_TARGET
17301730
"EXCLUDE_FROM_ALL;DONT_STRIP_NON_MAIN_SYMBOLS;DISABLE_ASLR;BUILD_WITH_STDLIB"
17311731
""
1732-
"DEPENDS;COMPONENT_DEPENDS;LINK_FAT_LIBRARIES"
1732+
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_FAT_LIBRARIES"
17331733
${ARGN})
17341734

17351735
set(SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS})
@@ -1781,7 +1781,7 @@ function(add_swift_target_executable name)
17811781
${VARIANT_NAME}
17821782
${SWIFTEXE_TARGET_SOURCES}
17831783
DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix}
1784-
COMPONENT_DEPENDS ${SWIFTEXE_TARGET_COMPONENT_DEPENDS}
1784+
LLVM_COMPONENT_DEPENDS ${SWIFTEXE_TARGET_LLVM_COMPONENT_DEPENDS}
17851785
SDK "${sdk}"
17861786
ARCHITECTURE "${arch}"
17871787
LINK_FAT_LIBRARIES ${SWIFTEXE_TARGET_LINK_FAT_LIBRARIES}
@@ -1797,7 +1797,7 @@ endfunction()
17971797
# Usage:
17981798
# add_swift_executable(name
17991799
# [DEPENDS dep1 ...]
1800-
# [COMPONENT_DEPENDS comp1 ...]
1800+
# [LLVM_COMPONENT_DEPENDS comp1 ...]
18011801
# [FILE_DEPENDS target1 ...]
18021802
# [LINK_LIBRARIES target1 ...]
18031803
# [EXCLUDE_FROM_ALL]
@@ -1811,7 +1811,7 @@ endfunction()
18111811
# LIBRARIES
18121812
# Libraries this executable depends on, without variant suffixes.
18131813
#
1814-
# COMPONENT_DEPENDS
1814+
# LLVM_COMPONENT_DEPENDS
18151815
# LLVM components this executable depends on.
18161816
#
18171817
# FILE_DEPENDS
@@ -1840,7 +1840,7 @@ function(add_swift_executable name)
18401840
cmake_parse_arguments(SWIFTEXE
18411841
"EXCLUDE_FROM_ALL;DONT_STRIP_NON_MAIN_SYMBOLS;DISABLE_ASLR"
18421842
""
1843-
"DEPENDS;COMPONENT_DEPENDS;LINK_LIBRARIES"
1843+
"DEPENDS;LLVM_COMPONENT_DEPENDS;LINK_LIBRARIES"
18441844
${ARGN})
18451845

18461846
translate_flag(${SWIFTEXE_EXCLUDE_FROM_ALL}
@@ -1859,7 +1859,7 @@ function(add_swift_executable name)
18591859
${name}
18601860
${SWIFTEXE_SOURCES}
18611861
DEPENDS ${SWIFTEXE_DEPENDS}
1862-
COMPONENT_DEPENDS ${SWIFTEXE_COMPONENT_DEPENDS}
1862+
LLVM_COMPONENT_DEPENDS ${SWIFTEXE_LLVM_COMPONENT_DEPENDS}
18631863
LINK_LIBRARIES ${SWIFTEXE_LINK_LIBRARIES}
18641864
SDK ${SWIFT_HOST_VARIANT_SDK}
18651865
ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}

‎lib/AST/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ add_swift_library(swiftAST STATIC
6868
clangAPINotes
6969
clangBasic
7070

71-
COMPONENT_DEPENDS
71+
LLVM_COMPONENT_DEPENDS
7272
bitreader bitwriter irreader debuginfoDWARF
7373
profiledata instrumentation object objcarcopts mc mcparser
7474
bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}

‎lib/ASTSectionImporter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_swift_library(swiftASTSectionImporter STATIC
22
ASTSectionImporter.cpp
33
LINK_LIBRARIES swiftBasic
4-
COMPONENT_DEPENDS core)
4+
LLVM_COMPONENT_DEPENDS core)
55

‎lib/Basic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ add_swift_library(swiftBasic STATIC
9898

9999
C_COMPILE_FLAGS ${UUID_INCLUDE}
100100
LINK_LIBRARIES ${UUID_LIBRARIES}
101-
COMPONENT_DEPENDS support)
101+
LLVM_COMPONENT_DEPENDS support)
102102

103103
message(STATUS "Swift version: ${SWIFT_VERSION}")
104104
message(STATUS "Swift vendor: ${SWIFT_VENDOR}")

‎lib/Immediate/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ add_swift_library(swiftImmediate STATIC
77
swiftSILGen
88
swiftSILOptimizer
99
swiftIRGen
10-
COMPONENT_DEPENDS
10+
LLVM_COMPONENT_DEPENDS
1111
linker mcjit)
1212

‎lib/LLVMPasses/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_library(swiftLLVMPasses STATIC
77
LLVMStackPromotion.cpp
88
LLVMMergeFunctions.cpp
99

10-
COMPONENT_DEPENDS
10+
LLVM_COMPONENT_DEPENDS
1111
analysis
1212
)
1313

‎tools/SourceKit/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ endfunction()
107107
# Usage:
108108
# add_sourcekit_library(name # Name of the library
109109
# [DEPENDS dep1 ...] # Libraries this library depends on
110-
# [COMPONENT_DEPENDS comp1 ...] # LLVM components this library depends on
110+
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this library depends on
111111
# [INSTALL_IN_COMPONENT comp] # The Swift installation component that this library belongs to.
112112
# [SHARED]
113113
# source1 [source2 source3 ...]) # Sources to add into this library
114114
macro(add_sourcekit_library name)
115115
cmake_parse_arguments(SOURCEKITLIB
116116
"SHARED"
117117
"INSTALL_IN_COMPONENT"
118-
"DEPENDS;COMPONENT_DEPENDS"
118+
"DEPENDS;LLVM_COMPONENT_DEPENDS"
119119
${ARGN})
120120
set(srcs ${SOURCEKITLIB_UNPARSED_ARGUMENTS})
121121

@@ -178,7 +178,7 @@ macro(add_sourcekit_library name)
178178
target_link_libraries("${name}" INTERFACE ${SOURCEKITLIB_DEPENDS})
179179
endif()
180180

181-
swift_common_llvm_config(${name} ${SOURCEKITLIB_COMPONENT_DEPENDS})
181+
swift_common_llvm_config(${name} ${SOURCEKITLIB_LLVM_COMPONENT_DEPENDS})
182182

183183
if(SOURCEKITLIB_SHARED AND EXPORTED_SYMBOL_FILE)
184184
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -212,7 +212,7 @@ endmacro()
212212
# Usage:
213213
# add_sourcekit_executable(name # Name of the executable
214214
# [DEPENDS dep1 ...] # Libraries this executable depends on
215-
# [COMPONENT_DEPENDS comp1 ...] # LLVM components this executable
215+
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this executable
216216
# # depends on
217217
# [EXCLUDE_FROM_ALL] # Whether to exclude this executable from
218218
# # the ALL_BUILD target
@@ -221,7 +221,7 @@ macro(add_sourcekit_executable name)
221221
cmake_parse_arguments(SOURCEKITEXE
222222
"EXCLUDE_FROM_ALL"
223223
""
224-
"DEPENDS;COMPONENT_DEPENDS"
224+
"DEPENDS;LLVM_COMPONENT_DEPENDS"
225225
${ARGN})
226226

227227
if (${SOURCEKITEXE_EXCLUDE_FROM_ALL})
@@ -240,7 +240,7 @@ macro(add_sourcekit_executable name)
240240
endif()
241241

242242
target_link_libraries(${name} ${SOURCEKITEXE_DEPENDS})
243-
swift_common_llvm_config(${name} ${SOURCEKITEXE_COMPONENT_DEPENDS})
243+
swift_common_llvm_config(${name} ${SOURCEKITEXE_LLVM_COMPONENT_DEPENDS})
244244
target_link_libraries(${name} ${LLVM_COMMON_LIBS})
245245

246246
set_target_properties(${name} PROPERTIES FOLDER "SourceKit executables")
@@ -263,13 +263,13 @@ endmacro()
263263
# Usage:
264264
# add_sourcekit_framework(name # Name of the framework
265265
# [DEPENDS dep1 ...] # Libraries this framework depends on
266-
# [COMPONENT_DEPENDS comp1 ...] # LLVM components this framework depends on
266+
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this framework depends on
267267
# [MODULEMAP modulemap] # Module map file for this framework
268268
# [INSTALL_IN_COMPONENT comp] # The Swift installation component that this framework belongs to.
269269
# source1 [source2 source3 ...]) # Sources to add into this framework
270270
macro(add_sourcekit_framework name)
271271
cmake_parse_arguments(SOURCEKITFW
272-
"" "MODULEMAP;INSTALL_IN_COMPONENT" "DEPENDS;COMPONENT_DEPENDS" ${ARGN})
272+
"" "MODULEMAP;INSTALL_IN_COMPONENT" "DEPENDS;LLVM_COMPONENT_DEPENDS" ${ARGN})
273273
set(srcs ${SOURCEKITFW_UNPARSED_ARGUMENTS})
274274

275275
set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -312,7 +312,7 @@ macro(add_sourcekit_framework name)
312312
endif(LLVM_COMMON_DEPENDS)
313313

314314
target_link_libraries(${name} PRIVATE ${SOURCEKITFW_DEPENDS})
315-
swift_common_llvm_config(${name} ${SOURCEKITFW_COMPONENT_DEPENDS})
315+
swift_common_llvm_config(${name} ${SOURCEKITFW_LLVM_COMPONENT_DEPENDS})
316316

317317
if (EXPORTED_SYMBOL_FILE)
318318
add_sourcekit_symbol_exports(${name} ${EXPORTED_SYMBOL_FILE})
@@ -379,10 +379,10 @@ endmacro(add_sourcekit_framework)
379379
# Usage:
380380
# add_sourcekit_xpc_service(name # Name of the XPC service
381381
# [DEPENDS dep1 ...] # Libraries this service depends on
382-
# [COMPONENT_DEPENDS comp1 ...] # LLVM components this service depends on
382+
# [LLVM_COMPONENT_DEPENDS comp1 ...] # LLVM components this service depends on
383383
# source1 [source2 source3 ...]) # Sources to add into this service
384384
macro(add_sourcekit_xpc_service name framework_target)
385-
cmake_parse_arguments(SOURCEKITXPC "" "" "DEPENDS;COMPONENT_DEPENDS" ${ARGN})
385+
cmake_parse_arguments(SOURCEKITXPC "" "" "DEPENDS;LLVM_COMPONENT_DEPENDS" ${ARGN})
386386
set(srcs ${SOURCEKITXPC_UNPARSED_ARGUMENTS})
387387

388388
set(lib_dir ${SOURCEKIT_LIBRARY_OUTPUT_INTDIR})
@@ -424,7 +424,7 @@ macro(add_sourcekit_xpc_service name framework_target)
424424
endif(LLVM_COMMON_DEPENDS)
425425

426426
target_link_libraries(${name} ${SOURCEKITXPC_DEPENDS})
427-
swift_common_llvm_config(${name} ${SOURCEKITXPC_COMPONENT_DEPENDS})
427+
swift_common_llvm_config(${name} ${SOURCEKITXPC_LLVM_COMPONENT_DEPENDS})
428428
target_link_libraries(${name} ${LLVM_COMMON_LIBS})
429429

430430
add_dependencies(${framework_target} ${name})

‎tools/SourceKit/lib/SwiftLang/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ add_sourcekit_library(SourceKitSwiftLang
3131
clangAST
3232
clangAPINotes
3333
clangBasic
34-
COMPONENT_DEPENDS ${LLVM_TARGETS_TO_BUILD}
34+
LLVM_COMPONENT_DEPENDS ${LLVM_TARGETS_TO_BUILD}
3535
bitreader
3636
bitwriter
3737
debuginfodwarf

‎tools/SourceKit/tools/complete-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif()
1111
add_sourcekit_executable(complete-test
1212
complete-test.cpp
1313
DEPENDS ${SOURCEKITD_TEST_DEPEND}
14-
COMPONENT_DEPENDS support option
14+
LLVM_COMPONENT_DEPENDS support option
1515
)
1616

1717
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

‎tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(HAVE_UNICODE_LIBEDIT)
1515
add_sourcekit_executable(sourcekitd-repl
1616
sourcekitd-repl.cpp
1717
DEPENDS ${SOURCEKITD_REPL_DEPEND} edit
18-
COMPONENT_DEPENDS support
18+
LLVM_COMPONENT_DEPENDS support
1919
)
2020

2121
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

‎tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ add_sourcekit_executable(sourcekitd-test
1717
TestOptions.cpp
1818
DEPENDS ${SOURCEKITD_TEST_DEPEND} SourceKitSupport
1919
clangRewrite clangLex clangBasic
20-
COMPONENT_DEPENDS support option
20+
LLVM_COMPONENT_DEPENDS support option
2121
)
2222

2323
add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)

‎tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if (SOURCEKIT_INSTALLING_INPROC)
55
${SOURCEKITD_SOURCE_DIR}/include/sourcekitd/sourcekitd.h
66
sourcekitdInProc.cpp
77
DEPENDS SourceKitSwiftLang sourcekitdAPI
8-
COMPONENT_DEPENDS support
8+
LLVM_COMPONENT_DEPENDS support
99
MODULEMAP module.modulemap
1010
INSTALL_IN_COMPONENT sourcekit-inproc
1111
)
@@ -14,7 +14,7 @@ else()
1414
add_sourcekit_library(sourcekitdInProc
1515
sourcekitdInProc.cpp
1616
DEPENDS SourceKitSwiftLang sourcekitdAPI
17-
COMPONENT_DEPENDS support
17+
LLVM_COMPONENT_DEPENDS support
1818
INSTALL_IN_COMPONENT sourcekit-inproc
1919

2020
# Note that this cannot be a static library due to the way it looks for the

‎tools/SourceKit/tools/sourcekitd/bin/XPC/Client/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_sourcekit_framework(sourcekitd
1111
${public_headers}
1212
sourcekitd.cpp tracer.cpp
1313
DEPENDS sourcekitdAPI
14-
COMPONENT_DEPENDS support
14+
LLVM_COMPONENT_DEPENDS support
1515
MODULEMAP module.modulemap
1616
INSTALL_IN_COMPONENT sourcekit-xpc-service
1717
)

‎tools/SourceKit/tools/sourcekitd/bin/XPC/Service/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if (NOT SOURCEKIT_INSTALLING_INPROC)
22
add_sourcekit_xpc_service(SourceKitService sourcekitd
33
XPCService.cpp XpcTracing.cpp
44
DEPENDS SourceKitSwiftLang sourcekitdAPI
5-
COMPONENT_DEPENDS support
5+
LLVM_COMPONENT_DEPENDS support
66
)
77
endif()
88

‎tools/swift-demangle/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_swift_executable(swift-demangle
22
swift-demangle.cpp
33
LINK_LIBRARIES swiftBasic
4-
COMPONENT_DEPENDS support)
4+
LLVM_COMPONENT_DEPENDS support)
55

66
swift_install_in_component(compiler
77
TARGETS swift-demangle

‎tools/swift-reflection-dump/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_swift_executable(swift-reflection-dump
22
swift-reflection-dump.cpp
33
LINK_FAT_LIBRARIES
44
swiftReflection
5-
COMPONENT_DEPENDS object support
5+
LLVM_COMPONENT_DEPENDS object support
66
)
77

88
swift_install_in_component(tools

0 commit comments

Comments
 (0)