Skip to content

Commit 480ac36

Browse files
committed
cmake: include swift client only when sourcekit xpc is present.
1 parent b68deb0 commit 480ac36

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

tools/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ add_swift_tool_subdirectory(swift-api-digester)
1616
add_swift_tool_subdirectory(swift-syntax-test)
1717
add_swift_tool_subdirectory(swift-refactor)
1818

19-
if (SWIFT_BUILD_SOURCEKIT AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
20-
set(BUILD_SOURCEKIT_SWIFT_CLIENT TRUE)
21-
else()
22-
set(BUILD_SOURCEKIT_SWIFT_CLIENT FALSE)
23-
endif()
24-
2519
if(SWIFT_BUILD_SOURCEKIT)
2620
add_swift_tool_subdirectory(SourceKit)
21+
if(BUILD_SOURCEKIT_FRAMEWORK AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
22+
set(BUILD_SOURCEKIT_SWIFT_CLIENT TRUE)
23+
else()
24+
set(BUILD_SOURCEKIT_SWIFT_CLIENT FALSE)
25+
endif()
2726
if(BUILD_SOURCEKIT_SWIFT_CLIENT)
2827
add_subdirectory(SwiftSourceKitClient)
2928
endif()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
add_subdirectory(InProc)
22
if (HAVE_XPC_H)
3+
set(BUILD_SOURCEKIT_FRAMEWORK TRUE)
34
add_subdirectory(XPC)
5+
else()
6+
set(BUILD_SOURCEKIT_FRAMEWORK FALSE)
47
endif()

0 commit comments

Comments
 (0)