Merge pull request #28270 from compnerd/sourcekit-simplify

Simplify SourceKit CMake

Author: compnerd

tools/SourceKit/lib/Support/CMakeLists.txt

@@ -1,15 +1,11 @@
-set(SourceKitSupport_sources
+add_sourcekit_library(SourceKitSupport
   Concurrency-libdispatch.cpp
   FuzzyStringMatcher.cpp
   Logging.cpp
   ImmutableTextBuffer.cpp
   ThreadSafeRefCntPtr.cpp
   Tracing.cpp
   UIDRegistry.cpp
-)
-
-add_sourcekit_library(SourceKitSupport
-  ${SourceKitSupport_sources}
   LINK_LIBS swiftBasic swiftSyntax clangBasic clangRewrite
 )
 if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)

tools/SourceKit/tools/sourcekitd/lib/API/CMakeLists.txt

@@ -1,5 +1,8 @@
+set(LLVM_OPTIONAL_SOURCES
+  sourcekitdAPI-XPC.cpp
+  sourcekitdAPI-InProc.cpp)
 
-set(sourcekitdAPI_sources
+add_sourcekit_library(sourcekitdAPI
   CodeCompletionResultsArray.cpp
   CompactArray.cpp
   DocStructureArray.cpp
@@ -9,22 +12,14 @@ set(sourcekitdAPI_sources
   sourcekitdAPI-Common.cpp
   TokenAnnotationsArray.cpp
   ExpressionTypeArray.cpp
+  LINK_LIBS
+      SourceKitSupport SourceKitSwiftLang
 )
 
-set(sourcekitdAPI_Darwin_sources
-  sourcekitdAPI-XPC.cpp)
-set(sourcekitdAPI_NonDarwin_InProc_sources
-  sourcekitdAPI-InProc.cpp)
-set(LLVM_OPTIONAL_SOURCES ${sourcekitdAPI_Darwin_sources} ${sourcekitdAPI_NonDarwin_InProc_sources})
-
 if(APPLE AND HAVE_XPC_H)
-  list(APPEND sourcekitdAPI_sources ${sourcekitdAPI_Darwin_sources})
+  target_sources(sourcekitdAPI PRIVATE
+    sourcekitdAPI-XPC.cpp)
 elseif(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
-  list(APPEND sourcekitdAPI_sources ${sourcekitdAPI_NonDarwin_InProc_sources})
+  target_sources(sourcekitdAPI PRIVATE
+    sourcekitdAPI-InProc.cpp)
 endif()
-
-add_sourcekit_library(sourcekitdAPI
-  ${sourcekitdAPI_sources}
-  LINK_LIBS
-      SourceKitSupport SourceKitSwiftLang
-)

tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -1,9 +1,4 @@
 if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
-  set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
-  set(SOURCEKITD_LINK_LIBS sourcekitd)
-  set(INSTALLED_COMP sourcekit-xpc-service)
-  set(DEPENDS_LIST "sourcekitd-test")
-
   # The build type of swiftlang should agree with stdlib
   # This setting could avoid us adding additional search paths when building
   # executables using SwiftLang.
@@ -25,11 +20,11 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD
     GYB_SOURCES
       UIDs.swift.gyb
 
-    DEPENDS ${DEPENDS_LIST}
+    DEPENDS sourcekitd-test
     SWIFT_MODULE_DEPENDS_OSX Darwin Foundation
-    PRIVATE_LINK_LIBRARIES ${SOURCEKITD_LINK_LIBS}
-    SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
-    INSTALL_IN_COMPONENT ${INSTALLED_COMP}
+    PRIVATE_LINK_LIBRARIES sourcekitd
+    SWIFT_COMPILE_FLAGS -F${SWIFT_LIBRARY_OUTPUT_INTDIR}
+    INSTALL_IN_COMPONENT sourcekit-xpc-service
     DARWIN_INSTALL_NAME_DIR "@rpath"
     TARGET_SDKS ${SOURCEKIT_DEFAULT_TARGET_SDK}
     IS_STDLIB)