Automatically update the CXX_STANDARD #64248
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compnerd
approved these changes
Mar 9, 2023
| message(FATAL_ERROR "Requested CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} which is less than the minimum C++ standard ${SWIFT_MIN_CXX_STANDARD}") | ||
| endif() | ||
|
|
||
| set(CMAKE_CXX_STANDARD ${SWIFT_MIN_CXX_STANDARD} CACHE STRING "C++ standard to conform to") |
There was a problem hiding this comment.
Does this not need to be forced?
There was a problem hiding this comment.
unset(CMAKE_CXX_STANDARD) will override it. I didn't wan't to force it in case someone did -DCMAKE_CXX_STANDARD=42 or had it set in some other way.
I think this is almost identical to how LLVM is handling the update now.
There was a problem hiding this comment.
- Correction:
unsetwill remove it from the cache and let theCACHEvar write it back with the new value.
There was a problem hiding this comment.
etcwilde
force-pushed
the
ewilde/i-have-standards-you-know
branch
from
fe1ecb1 to
32f0498
Compare
Folks are running into issues updating because the CXX standard is cached and we updated it. This patch allows CMake to update it to a minimum required version for Swift. If it's in the cache and too low, it will update it. If it's manually specified and too low, it will give a fatal error letting the dev know it's too low.
etcwilde
force-pushed
the
ewilde/i-have-standards-you-know
branch
from
32f0498 to
e695385
Compare
|
@swift-ci please smoke test |
|
Windows failure looks like |
|
@swift-ci please smoke test windows |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Folks are running into issues updating because the CXX standard is cached and we updated it. This patch allows CMake to update it to a minimum required version for Swift. If it's in the cache and too low, it will update it. If it's manually specified and too low, it will give a fatal error letting the dev know it's too low.