Remove CXX_STD and inherit CMAKE_CXX_STANDARD from parent project #2005
Conversation
This file contains 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
The comment states that "We don't use CMAKE_CXX_STANDARD [...]", however, the toplevel CMakeLists.txt sets `CMAKE_CXX_STANDARD`, which makes the use of `CXX_STD` redundant. When checking the actual compiler invocation, two distinct `-std=` options are passed to the compiler as a result.
This allows projects that include folly through `add_subdirectory` to be built with a different (newer) standard and have folly inherit the standard from the parent project.
|
ping |
eugene536
reviewed
Jul 8, 2023
| set(CMAKE_CXX_STANDARD 17) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
| if(NOT CMAKE_CXX_STANDARD) | ||
| set(CMAKE_CXX_STANDARD 17) |
There was a problem hiding this comment.
fwiw) we can set CMAKE_CXX_STANDARD as a CACHE variable and remove the if
set(CMAKE_CXX_STANDARD "17" CACHE STRING "folly C++ standard")
|
@Orvid has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
facebook-github-bot
pushed a commit
to facebook/hhvm
that referenced
this pull request
Jul 31, 2023
Summary: This follows up on a discussion in facebook/folly#1949 and the comment by ot that the C++ standard for folly should be (easily) settable by a parent project. There are two commits in this PR: - The first commit removes the redundant `CXX_STD`, which causes `-std=` to be passed to the compiler twice. - The second commit introduces a check before setting `CMAKE_CXX_STANDARD`, so a value set by a parent project won't be overridden. X-link: facebook/folly#2005 Reviewed By: Gownta Differential Revision: D47343926 Pulled By: Orvid fbshipit-source-id: a712d117a6d6e2d125ee71f5f8d47ee5ceb3106b
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.
This follows up on a discussion in #1949 and the comment by @ot that the C++ standard for folly should be (easily) settable by a parent project.
There are two commits in this PR:
CXX_STD, which causes-std=to be passed to the compiler twice.CMAKE_CXX_STANDARD, so a value set by a parent project won't be overridden.