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

CMake: configurejson2cmake: Port precompile_header feature

Browse Source 
We don't need the test, we can just check the value of BUILD_WITH_PCH
to know whether the feature is enabled.

Regenerate configure.cmake files.

Change-Id: I5691a22af2913bc398f99825e0c41cf2daf5a587
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2020-04-03 16:33:24 +02:00
parent d8b49e6b51
commit 34c7344e2a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.cmake
View File

@ -130,7 +130,8 @@ int main(int argc, char **argv)
qt_config_compile_test("separate_debug_info"
LABEL "separate debug information support"
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info")
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info"
)
# signaling_nan
qt_config_compile_test(signaling_nan
LABEL "Signaling NaN for doubles"
@ -492,6 +493,11 @@ qt_feature("c11" PUBLIC
LABEL "C11"
CONDITION QT_FEATURE_c99 AND c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES
)
qt_feature("precompile_header"
LABEL "Using precompiled headers"
CONDITION BUILD_WITH_PCH
)
qt_feature_config("precompile_header" QMAKE_PRIVATE_CONFIG)
qt_feature("reduce_exports" PRIVATE
LABEL "Reduce amount of exported symbols"
CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY

4
util/cmake/configurejson2cmake.py
View File

@ -865,7 +865,9 @@ def get_feature_mapping():
"enable": "TEST_posix_iconv AND TEST_iconv_needlib",
"disable": "NOT TEST_posix_iconv OR NOT TEST_iconv_needlib",
},
"precompile_header": None,
"precompile_header": {
"condition": "BUILD_WITH_PCH"
},
"profile": None,
"qmakeargs": None,
"qpa_default_platform": None, # Not a bool!