diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-02 14:00:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-02 14:01:23 (GMT) |
| commit | 1b6ec4b9e34a06c047cb41245587673959b5b591 (patch) | |
| tree | 4945534c7f8b71ea81c4a9c708e2531d907e275c /Source/cmLocalGenerator.cxx | |
| parent | 5d5e1e691772ecfd9224be0afe33802f8aee3fc3 (diff) | |
| parent | 8570dc7f64928ec7896197394f089f5ad063c6ca (diff) | |
| download | CMake-1b6ec4b9e34a06c047cb41245587673959b5b591.zip CMake-1b6ec4b9e34a06c047cb41245587673959b5b591.tar.gz CMake-1b6ec4b9e34a06c047cb41245587673959b5b591.tar.bz2 | |
Merge topic 'features-c++20'
8570dc7f64 Help: Update compiler versions in cmake-compile-features.7.rst
874d3d2948 Help: Add release note for C++ 20 support
7f295b1bd3 Features: Activate C++ 20 support for Clang 5.0+
71cb8ce3a1 Features: Activate C++ 20 support for GNU 8.0+
8f146c4508 Features: Activate C++ 20 support for MSVC 19.12.25835+
7fe580a362 Features: Add infrastructure for C++ 20 language standard
1b328e09a3 Features: Use -std=c++17 for C++ 17 on Clang 5.0+
0bc3e5788a Features: Use -std=c++17 for C++ 17 on GNU 8.0+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1892
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index e942ff4..629d54a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1561,6 +1561,7 @@ void cmLocalGenerator::AddCompilerRequirementFlag( static std::map<std::string, std::vector<std::string>> langStdMap; if (langStdMap.empty()) { // Maintain sorted order, most recent first. + langStdMap["CXX"].push_back("20"); langStdMap["CXX"].push_back("17"); langStdMap["CXX"].push_back("14"); langStdMap["CXX"].push_back("11"); |