Skip to content

build: begin rooting out EXCLUDE_FROM_ALL #29450

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
compnerd merged 1 commit into from
Jan 26, 2020
Merged

build: begin rooting out EXCLUDE_FROM_ALL #29450

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
7 changes: 3 additions & 4 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,9 +2546,9 @@ function(_add_swift_executable_single name)

set(SWIFTEXE_SINGLE_SOURCES ${SWIFTEXE_SINGLE_UNPARSED_ARGUMENTS})

translate_flag(${SWIFTEXE_SINGLE_EXCLUDE_FROM_ALL}
"EXCLUDE_FROM_ALL"
SWIFTEXE_SINGLE_EXCLUDE_FROM_ALL_FLAG)
if(SWIFTEXE_SINGLE_EXCLUDE_FROM_ALL)
message(SEND_ERROR "${name} is using EXCLUDE_FROM_ALL option which is deprecated.")
endif()

# Check arguments.
precondition(SWIFTEXE_SINGLE_SDK MESSAGE "Should specify an SDK")
Expand Down Expand Up @@ -2612,7 +2612,6 @@ function(_add_swift_executable_single name)
add_swift_source_group("${SWIFTEXE_SINGLE_EXTERNAL_SOURCES}")

add_executable(${name}
${SWIFTEXE_SINGLE_EXCLUDE_FROM_ALL_FLAG}
${SWIFTEXE_SINGLE_SOURCES}
${SWIFTEXE_SINGLE_EXTERNAL_SOURCES})

Expand Down
24 changes: 11 additions & 13 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ function(add_swift_target_executable name)

set(SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS})

translate_flag(${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL}
"EXCLUDE_FROM_ALL"
SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG)
if(SWIFTEXE_TARGET_EXCLUDE_FROM_ALL)
message(SEND_ERROR "${name} is using EXCLUDE_FROM_ALL which is deprecated.")
endif()

# All Swift executables depend on the standard library.
list(APPEND SWIFTEXE_TARGET_LINK_LIBRARIES swiftCore)
Expand All @@ -29,14 +29,6 @@ function(add_swift_target_executable name)
set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
set(VARIANT_NAME "${name}${VARIANT_SUFFIX}")

set(SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT
${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG})
if(NOT "${VARIANT_SUFFIX}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SUFFIX}")
# By default, don't build executables for target SDKs to avoid building
# target stdlibs.
set(SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT "EXCLUDE_FROM_ALL")
endif()

if(SWIFTEXE_TARGET_BUILD_WITH_STDLIB)
add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}" ${VARIANT_NAME})
endif()
Expand All @@ -54,8 +46,14 @@ function(add_swift_target_executable name)
LLVM_LINK_COMPONENTS ${SWIFTEXE_TARGET_LLVM_LINK_COMPONENTS}
SDK "${sdk}"
ARCHITECTURE "${arch}"
LINK_LIBRARIES ${SWIFTEXE_TARGET_LINK_LIBRARIES}
${SWIFTEXE_TARGET_EXCLUDE_FROM_ALL_FLAG_CURRENT})
LINK_LIBRARIES ${SWIFTEXE_TARGET_LINK_LIBRARIES})

if(NOT "${VARIANT_SUFFIX}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SUFFIX}")
# By default, don't build executables for target SDKs to avoid building
# target stdlibs.
set_target_properties(${VARIANT_NAME} PROPERTIES
EXCLUDE_FROM_ALL TRUE)
endif()

if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)
add_custom_command_target(unused_var2
Expand Down