Skip to content

[CMake] Only build StdlibUnittest when SDK overlay is built #3043

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
swift-ci merged 1 commit into from
Jun 19, 2016
Merged

[CMake] Only build StdlibUnittest when SDK overlay is built #3043

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
23 changes: 8 additions & 15 deletions stdlib/private/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,16 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
add_subdirectory(SwiftPrivate)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if(SWIFT_BUILD_SDK_OVERLAY)
# FIXME: there is nothing Darwin-specific in StdlibUnittest, but to use
# POSIX APIs it imports the Darwin module on Apple platforms, so it can't
# be built separately from the SDK overlay.
add_subdirectory(StdlibUnittest)
add_subdirectory(StdlibCollectionUnittest)
add_subdirectory(StdlibUnittestFoundationExtras)
add_subdirectory(SwiftPrivateLibcExtras)
add_subdirectory(SwiftPrivatePthreadExtras)
add_subdirectory(SwiftReflectionTest)
endif()
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
if(SWIFT_BUILD_SDK_OVERLAY)
# SwiftPrivatePthreadExtras makes use of Darwin/Glibc, which is part of the
# SDK overlay. It can't be built separately from the SDK overlay.
add_subdirectory(StdlibUnittest)
add_subdirectory(StdlibCollectionUnittest)
add_subdirectory(SwiftPrivateLibcExtras)
add_subdirectory(SwiftPrivatePthreadExtras)

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_subdirectory(StdlibUnittestFoundationExtras)
add_subdirectory(SwiftReflectionTest)
endif()
endif()