Skip to content

Commit 9d8d013

Browse files
authored
Merge pull request swiftlang#29383 from compnerd/exclude-exclusion
build: remove support for `EXCLUDE_FROM_ALL` (NFC)
2 parents 4ece4fc + 1f96141 commit 9d8d013

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,21 +213,16 @@ endmacro()
213213
# add_sourcekit_executable(name # Name of the executable
214214
# [LLVM_LINK_COMPONENTS comp1 ...] # LLVM components this executable
215215
# # depends on
216-
# [EXCLUDE_FROM_ALL] # Whether to exclude this executable from
217-
# # the ALL_BUILD target
218216
# source1 [source2 source3 ...]) # Sources to add into this executable
219217
macro(add_sourcekit_executable name)
220-
cmake_parse_arguments(SOURCEKITEXE
221-
"EXCLUDE_FROM_ALL"
222-
""
223-
"LLVM_LINK_COMPONENTS"
224-
${ARGN})
225-
226-
if (${SOURCEKITEXE_EXCLUDE_FROM_ALL})
227-
add_executable(${name} EXCLUDE_FROM_ALL ${SOURCEKITEXE_UNPARSED_ARGUMENTS})
228-
else()
229-
add_executable(${name} ${SOURCEKITEXE_UNPARSED_ARGUMENTS})
230-
endif()
218+
set(SOURCEKIT_EXECUTABLE_options)
219+
set(SOURCEKIT_EXECUTABLE_single_parameter_options)
220+
set(SOURCEKIT_EXECUTABLE_multiple_parameter_options LLVM_LINK_COMPONENTS)
221+
cmake_parse_arguments(SOURCEKITEXE "${SOURCEKIT_EXECUTABLE_options}"
222+
"${SOURCEKIT_EXECUTABLE_single_parameter_options}"
223+
"${SOURCEKIT_EXECUTABLE_multiple_parameter_options}" ${ARGN})
224+
225+
add_executable(${name} ${SOURCEKITEXE_UNPARSED_ARGUMENTS})
231226
if(NOT SWIFT_BUILT_STANDALONE AND NOT CMAKE_C_COMPILER_ID MATCHES Clang)
232227
add_dependencies(${name} clang)
233228
endif()

0 commit comments

Comments
 (0)