summaryrefslogtreecommitdiff
path: root/configure.cmake
diff options
context:
space:
mode:
authorYuhang Zhao <2546789017@qq.com>2021-11-19 10:29:27 +0800
committerYuhang Zhao <2546789017@qq.com>2022-04-06 13:06:24 +0800
commit42287255d38bf493b5731396b99bc9cd7b1baba4 (patch)
treeab13cf715f2dc0468184772438222ee33228da6f /configure.cmake
parentdbae10487e302d36ab32f1e812834b53c1fbec71 (diff)
downloadqtbase-42287255d38bf493b5731396b99bc9cd7b1baba4.tar.gz
Build system: Allow user to enable Intel CET
MSVC: https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-eh-continuation-metadata?view=msvc-170 https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-170 GCC: https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/Instrumentation-Options.html Clang: Don't know where's the documentation but should use the same parameter with GCC. Change-Id: I654618e45743a5ad1394c930932b9d0044572725 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake
index 2274f1554d..30d9551b6b 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -1034,7 +1034,7 @@ qt_feature("relocatable" PRIVATE
)
qt_feature("intelcet" PRIVATE
LABEL "Using Intel CET"
- CONDITION TEST_intelcet
+ CONDITION ( INPUT_intelcet STREQUAL yes ) OR TEST_intelcet
)
qt_configure_add_summary_build_type_and_config()
qt_configure_add_summary_section(NAME "Build options")
@@ -1085,6 +1085,7 @@ qt_configure_add_summary_entry(
qt_configure_add_summary_entry(ARGS "relocatable")
qt_configure_add_summary_entry(ARGS "precompile_header")
qt_configure_add_summary_entry(ARGS "ltcg")
+qt_configure_add_summary_entry(ARGS "intelcet")
qt_configure_add_summary_section(NAME "Target compiler supports")
qt_configure_add_summary_entry(
TYPE "featureList"