move to sourcekit dir

Author: nkcsgexi

cmake/modules/AddSwift.cmake

@@ -1656,9 +1656,14 @@ function(add_swift_library name)
           # Add dependencies on the (not-yet-created) custom lipo target.
           foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
             if (NOT "${DEP}" STREQUAL "icucore")
+              # Avoid appending SDK kinds after sourcekit
+              if ("${DEP}" MATCHES "^sourcekitd")
+                add_dependencies(${VARIANT_NAME} "sourcekitd")
+              else()
               add_dependencies(${VARIANT_NAME}
                 "${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
             endif()
+            endif()
           endforeach()
 
           if (SWIFTLIB_IS_STDLIB AND SWIFTLIB_STATIC)

tools/CMakeLists.txt

@@ -35,9 +35,6 @@ endif()
 
 if(SWIFT_BUILD_SOURCEKIT)
   add_swift_tool_subdirectory(SourceKit)
-  if(BUILD_SOURCEKIT_XPC_SERVICE AND BUILD_FOUNDATION)
-    add_subdirectory(SwiftSourceKitClient)
-  endif()
 endif()
 
 if(SWIFT_HOST_VARIANT STREQUAL "macosx")

tools/SourceKit/tools/CMakeLists.txt

@@ -10,3 +10,6 @@ if(HAVE_UNICODE_LIBEDIT)
   add_swift_tool_subdirectory(sourcekitd-repl)
 endif()
 add_swift_tool_subdirectory(complete-test)
+if(BUILD_FOUNDATION)
+  add_subdirectory(SwiftSourceKitClient)
+endif()

tools/SwiftSourceKitClient/CMakeLists.txt renamed to tools/SourceKit/tools/SwiftSourceKitClient/CMakeLists.txt

@@ -9,7 +9,7 @@ add_swift_library(swiftSwiftLang SHARED
   SourceKitdResponse.swift
   SourceKitdUID.swift
 
-  FRAMEWORK_DEPENDS sourcekitd
+  LINK_LIBRARIES sourcekitd
   SWIFT_COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
   LINK_FLAGS ${EXTRA_LINKER_FLAGS}
   SWIFT_MODULE_DEPENDS Foundation