1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: remove a duplicate check for C++2b

Browse Source 
Change-Id: Ie617fa277fc3a36b5e2f34ae1b79099193ae1b17
Pick-to: 6.6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 918ac58a89b17a73a73bb15055d97f6eee782051)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2024-02-28 00:12:31 +01:00 committed by Qt Cherry-pick Bot
parent 92e1bf8e3b
commit 80a3175a28
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.cmake
View File

@ -632,13 +632,9 @@ qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("c++2b" PUBLIC qt_feature("c++2b" PUBLIC
LABEL "C++2b" LABEL "C++2b"
AUTODETECT OFF AUTODETECT OFF
)
qt_feature_config("c++2b" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("c++2b" PUBLIC
LABEL "C++2b"
AUTODETECT FALSE
CONDITION QT_FEATURE_cxx20 AND (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20") AND TEST_cxx2b CONDITION QT_FEATURE_cxx20 AND (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20") AND TEST_cxx2b
) )
qt_feature_config("c++2b" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("precompile_header" qt_feature("precompile_header"
LABEL "Using precompiled headers" LABEL "Using precompiled headers"
CONDITION BUILD_WITH_PCH AND TEST_precompile_header CONDITION BUILD_WITH_PCH AND TEST_precompile_header