cmake fix.

Author: nkcsgexi

CMakeLists.txt

@@ -14,6 +14,9 @@ set_property(GLOBAL PROPERTY JOB_POOL_LINK local_jobs)
 # First include general CMake utilities.
 include(SwiftUtils)
 include(CheckSymbolExists)
+include(CheckIncludeFiles)
+
+check_include_files("xpc/xpc.h" HAVE_XPC_H)
 
 #
 # User-configurable options that control the inclusion and default build
@@ -393,6 +396,12 @@ option(SWIFT_ENABLE_SOURCEKIT_TESTS
     "Enable running SourceKit tests"
     ${SWIFT_BUILD_SOURCEKIT_default})
 
+if(HAVE_XPC_H AND SWIFT_BUILD_SOURCEKIT)
+  set(BUILD_SOURCEKIT_FRAMEWORK TRUE)
+else()
+  set(BUILD_SOURCEKIT_FRAMEWORK FALSE)
+endif()
+
 #
 # Assume a new enough ar to generate the index at construction time. This avoids
 # having to invoke ranlib as a secondary command.

tools/CMakeLists.txt

@@ -16,9 +16,15 @@ add_swift_tool_subdirectory(swift-api-digester)
 add_swift_tool_subdirectory(swift-syntax-test)
 add_swift_tool_subdirectory(swift-refactor)
 
+if(SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
+  set(BUILD_FOUNDATION TRUE)
+else()
+  set(BUILD_FOUNDATION FALSE)
+endif()
+
 if(SWIFT_BUILD_SOURCEKIT)
   add_swift_tool_subdirectory(SourceKit)
-  if(BUILD_SOURCEKIT_FRAMEWORK AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
+  if(BUILD_SOURCEKIT_FRAMEWORK AND BUILD_FOUNDATION)
     set(BUILD_SOURCEKIT_SWIFT_CLIENT TRUE)
   else()
     set(BUILD_SOURCEKIT_SWIFT_CLIENT FALSE)
@@ -35,7 +41,7 @@ if(SWIFT_HOST_VARIANT STREQUAL "macosx")
   # SwiftSyntax depends on both the standard library (because it's a
   # Swift module), and the SDK overlays (because it depends on Foundation).
   # Ensure we only build SwiftSyntax when we're building both.
-  if(SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
+  if(BUILD_FOUNDATION)
     add_subdirectory(SwiftSyntax)
   endif()
 endif()

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

@@ -1,7 +1,4 @@
   add_subdirectory(InProc)
-if (HAVE_XPC_H)
-  set(BUILD_SOURCEKIT_FRAMEWORK TRUE)
+if(BUILD_SOURCEKIT_FRAMEWORK)
   add_subdirectory(XPC)
-else()
-  set(BUILD_SOURCEKIT_FRAMEWORK FALSE)
 endif()

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

@@ -1,7 +1,3 @@
-include(CheckIncludeFiles)
-
-check_include_files("xpc/xpc.h" HAVE_XPC_H)
-
 # If we were going to build for APPLE but don't have XPC, just build inproc.
 if(APPLE AND NOT HAVE_XPC_H)
   set(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY TRUE)