Skip to content

Commit 7722d43

Browse files
committed
build: simplify source file handling for sourcekitdAPI
Avoid unnecessary list handling for the sources for sourcekitdAPI, inline the single use of the list and appending of the sources.
1 parent df27954 commit 7722d43

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed
Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
set(LLVM_OPTIONAL_SOURCES
2+
sourcekitdAPI-XPC.cpp
3+
sourcekitdAPI-InProc.cpp)
14

2-
set(sourcekitdAPI_sources
5+
add_sourcekit_library(sourcekitdAPI
36
CodeCompletionResultsArray.cpp
47
CompactArray.cpp
58
DocStructureArray.cpp
@@ -9,22 +12,14 @@ set(sourcekitdAPI_sources
912
sourcekitdAPI-Common.cpp
1013
TokenAnnotationsArray.cpp
1114
ExpressionTypeArray.cpp
15+
LINK_LIBS
16+
SourceKitSupport SourceKitSwiftLang
1217
)
1318

14-
set(sourcekitdAPI_Darwin_sources
15-
sourcekitdAPI-XPC.cpp)
16-
set(sourcekitdAPI_NonDarwin_InProc_sources
17-
sourcekitdAPI-InProc.cpp)
18-
set(LLVM_OPTIONAL_SOURCES ${sourcekitdAPI_Darwin_sources} ${sourcekitdAPI_NonDarwin_InProc_sources})
19-
2019
if(APPLE AND HAVE_XPC_H)
21-
list(APPEND sourcekitdAPI_sources ${sourcekitdAPI_Darwin_sources})
20+
target_sources(sourcekitdAPI PRIVATE
21+
sourcekitdAPI-XPC.cpp)
2222
elseif(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
23-
list(APPEND sourcekitdAPI_sources ${sourcekitdAPI_NonDarwin_InProc_sources})
23+
target_sources(sourcekitdAPI PRIVATE
24+
sourcekitdAPI-InProc.cpp)
2425
endif()
25-
26-
add_sourcekit_library(sourcekitdAPI
27-
${sourcekitdAPI_sources}
28-
LINK_LIBS
29-
SourceKitSupport SourceKitSwiftLang
30-
)

0 commit comments

Comments
 (0)