Skip to content

Commit acfe645

Browse files
committed
[cmake] Disable libswift and cmake tests when building using the Xcode generator.
We should re-enable this once it is clear that there aren't issues with the Xcode generator/host side swift cmake. The Ninja generator (the default) still is enabled.
1 parent 775bff0 commit acfe645

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,11 @@ if(SWIFT_INCLUDE_TOOLS)
10421042
# "libswift" must come before "tools".
10431043
# It adds libswift module names to the global property "libswift_modules"
10441044
# which is used in add_swift_host_tool for the lldb workaround.
1045-
add_subdirectory(libswift)
1045+
#
1046+
# NOTE: We do not currently support libswift with the Xcode generator.
1047+
if (NOT CMAKE_GENERATOR STREQUAL "Xcode")
1048+
add_subdirectory(libswift)
1049+
endif()
10461050

10471051
# Always include this after including stdlib/!
10481052
# Refer to the large comment above the add_subdirectory(stdlib) call.

validation-test/BuildSystem/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
# if we build on Darwin since we do not have a host toolchain available when
44
# compiling on the bots for Linux meaning this path would not be tested.
55
if (CMAKE_Swift_COMPILER AND APPLE)
6-
add_subdirectory(swift-cmake)
6+
# We do not support this with the Xcode generator currently.
7+
if (NOT CMAKE_GENERATOR STREQUAL "Xcode")
8+
add_subdirectory(swift-cmake)
9+
endif()
710
endif()

0 commit comments

Comments
 (0)