summaryrefslogtreecommitdiffstats
path: root/qt_cmdline.cmake
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-04 11:52:55 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-08 19:43:34 +0200
commitdc3b2ac81d60c682e6bcdddfb9a7ca4ed187bc13 (patch)
tree8eb8eaec914d352bb3381f7bb175167b41aed30f /qt_cmdline.cmake
parent4d2ef8208955846b6fca178648840b93e8fe09e1 (diff)
C++23/c++2b support
Change-Id: I33b2a48312ae94e3d5ebb4097e50c4953e14d533 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qt_cmdline.cmake')
-rw-r--r--qt_cmdline.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
index a6dd809bf6..c0c875fa78 100644
--- a/qt_cmdline.cmake
+++ b/qt_cmdline.cmake
@@ -138,18 +138,27 @@ function(qt_commandline_cxxstd arg val nextok)
qtConfCommandlineSetInput(c++14 no)
qtConfCommandlineSetInput(c++17 no)
qtConfCommandlineSetInput(c++20 no)
+ qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(14|1y)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 no)
qtConfCommandlineSetInput(c++20 no)
+ qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(17|1z)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 yes)
qtConfCommandlineSetInput(c++20 no)
+ qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(20|2a)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 yes)
qtConfCommandlineSetInput(c++20 yes)
+ qtConfCommandlineSetInput(c++2b no)
+ elseif(val MATCHES "(c\\+\\+)?(2b)")
+ qtConfCommandlineSetInput(c++14 yes)
+ qtConfCommandlineSetInput(c++17 yes)
+ qtConfCommandlineSetInput(c++20 yes)
+ qtConfCommandlineSetInput(c++2b yes)
else()
qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'")
endif()