diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-02-09 13:12:09 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-10 09:13:11 +0000 |
commit | fe38ba8cf34cd5cb8e0fc4fe80991d7171db4765 (patch) | |
tree | 4dcf064ee2b875dd83e73765e556f3d366d0e876 /configure.cmake | |
parent | 4f2f53dd7f4291976a66f821af25d32becb02345 (diff) |
Update name of c++2a to c++20
Keep the c++2a feature, but make it an alias for compatibility
purposes.
Change-Id: I6f153109be84659806f1b7a57a88a187875166d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 3c412c93c251862a2791557881f9232fd76fda79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
-rw-r--r-- | configure.cmake | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.cmake b/configure.cmake index d0767902c8..6bfe12d670 100644 --- a/configure.cmake +++ b/configure.cmake @@ -67,12 +67,12 @@ std::visit([](const auto &) { return 1; }, v); CXX_STANDARD 17 ) -# cxx2a -qt_config_compile_test(cxx2a - LABEL "C++2a support" +# cxx20 +qt_config_compile_test(cxx20 + LABEL "C++20 support" CODE "#if __cplusplus > 201703L -// Compiler claims to support experimental C++2a, trust it +// Compiler claims to support C++20, trust it #else # error __cplusplus must be > 201703L (the value for C++17) #endif @@ -607,10 +607,15 @@ qt_feature("c++1z" PUBLIC CONDITION QT_FEATURE_cxx17 ) qt_feature_config("c++1z" QMAKE_PUBLIC_QT_CONFIG) -qt_feature("c++2a" PUBLIC - LABEL "C++2a" +qt_feature("c++20" PUBLIC + LABEL "C++20" AUTODETECT OFF - CONDITION QT_FEATURE_cxx17 AND TEST_cxx2a + CONDITION QT_FEATURE_cxx17 AND TEST_cxx20 +) +qt_feature_config("c++20" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++2a" PUBLIC + LABEL "C++20" + CONDITION QT_FEATURE_cxx20 ) qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG) qt_feature("c89" @@ -970,7 +975,7 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( TYPE "firstAvailableFeature" - ARGS "c++2a c++17 c++14 c++11" + ARGS "c++20 c++17 c++14 c++11" MESSAGE "Using C++ standard" ) qt_configure_add_summary_entry( |