Skip to content

build: remove unnecessary property sets (NFC) #24827

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
May 18, 2019
Merged

build: remove unnecessary property sets (NFC) #24827

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
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ endif()

set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
"Build Swift with code coverage instrumenting enabled [FALSE, NOT-MERGED, MERGED]")
set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
STRINGS FALSE "NOT-MERGED" "MERGED")

# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
# can be reused when a new version of Swift comes out (assuming the user hasn't
Expand Down Expand Up @@ -171,8 +169,6 @@ endif()

set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
"Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
# Allow the user to specify the standard library CMAKE_MSVC_RUNTIME_LIBRARY
# value. The following values are valid:
# - MultiThreaded (/MT)
Expand Down
4 changes: 0 additions & 4 deletions cmake/modules/StandaloneOverlay.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ option(SWIFT_ENABLE_PARSEABLE_MODULE_INTERFACES
set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
"Build type for the Swift standard library and SDK overlays.")

set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
STRINGS
"Debug" "RelWithDebInfo" "Release" "MinSizeRel")

# -----------------------------------------------------------------------------
# Constants

Expand Down