Skip to content

[cmake] Disable libswift and cmake tests when building using the Xcode generator. #37994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2021
Merged

[cmake] Disable libswift and cmake tests when building using the Xcode generator. #37994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,11 @@ if(SWIFT_INCLUDE_TOOLS)
# "libswift" must come before "tools".
# It adds libswift module names to the global property "libswift_modules"
# which is used in add_swift_host_tool for the lldb workaround.
add_subdirectory(libswift)
#
# NOTE: We do not currently support libswift with the Xcode generator.
if (NOT CMAKE_GENERATOR STREQUAL "Xcode")
add_subdirectory(libswift)
endif()

# Always include this after including stdlib/!
# Refer to the large comment above the add_subdirectory(stdlib) call.
Expand Down
5 changes: 4 additions & 1 deletion validation-test/BuildSystem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
# if we build on Darwin since we do not have a host toolchain available when
# compiling on the bots for Linux meaning this path would not be tested.
if (CMAKE_Swift_COMPILER AND APPLE)
add_subdirectory(swift-cmake)
# We do not support this with the Xcode generator currently.
if (NOT CMAKE_GENERATOR STREQUAL "Xcode")
add_subdirectory(swift-cmake)
endif()
endif()