summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.cmake8
-rwxr-xr-xutil/cmake/configurejson2cmake.py4
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake
index 52943980a8..0af3479cf2 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -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
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 11b216dc37..a5cd9ff022 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -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!