summaryrefslogtreecommitdiffstats
path: root/configure.cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-06-17 22:18:22 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-06-19 01:08:23 +0200
commit95de42212405aea45b17f2d9c500b6af097dee3e (patch)
tree24dbf716179e37043ca2cb42ad74607c30313ea3 /configure.cmake
parented92cb30e465c1dad704bd268646a4a69b1d448c (diff)
Fix the precompile_header configure test
This configure test always failed, and its result was never used. Pick-to: 6.2 Change-Id: I5112464b247efb5327ef5c23c96ef27168c11afc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake15
1 files changed, 2 insertions, 13 deletions
diff --git a/configure.cmake b/configure.cmake
index e31d8b6f56..1bbc8b8672 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -95,18 +95,7 @@ int main(void)
# precompile_header
qt_config_compile_test(precompile_header
LABEL "precompiled header support"
- CODE
-"#ifndef HEADER_H
-#error no go
-#endif
-
-int main(void)
-{
- /* BEGIN TEST: */
- /* END TEST: */
- return 0;
-}
-"# FIXME: qmake: ['CONFIG += precompile_header', 'PRECOMPILED_DIR = .pch', 'PRECOMPILED_HEADER = header.h']
+ PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/precompile_header"
)
qt_config_compiler_supports_flag_test(use_bfd_linker
@@ -614,7 +603,7 @@ qt_feature("c11" PUBLIC
)
qt_feature("precompile_header"
LABEL "Using precompiled headers"
- CONDITION BUILD_WITH_PCH
+ CONDITION BUILD_WITH_PCH AND TEST_precompile_header
AUTODETECT NOT WASM
)
qt_feature_config("precompile_header" QMAKE_PRIVATE_CONFIG)