From 6af63c82562935a02c9dad709c8f15b57d62d3ae Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Thu, 23 Jun 2022 11:39:58 +0800 Subject: [PATCH] CMake: Update description of the Intel CET feature Use a more detailed description instead. Also adds the missing part of the GCC parameter. Amends commit qtbase/42287255d38bf493b5731396b99bc9cd7b1baba4 References: https://gcc.gnu.org/onlinedocs/gcc-12.1.0/gcc/Instrumentation-Options.html#Instrumentation-Options Change-Id: I94a22ac7dfa80644e92fe01021f7868dfa02dd69 Reviewed-by: Thiago Macieira Reviewed-by: Alexandru Croitor --- cmake/QtInternalTargets.cmake | 2 +- configure.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index bf7ef3cf36..377099ed62 100644 --- a/cmake/QtInternalTargets.cmake +++ b/cmake/QtInternalTargets.cmake @@ -284,7 +284,7 @@ if(QT_FEATURE_intelcet) ) else() target_compile_options(PlatformCommonInternal INTERFACE - -fcf-protection + -fcf-protection=full ) endif() endif() diff --git a/configure.cmake b/configure.cmake index f8cb1dccad..628437460a 100644 --- a/configure.cmake +++ b/configure.cmake @@ -983,7 +983,7 @@ qt_feature("relocatable" PRIVATE CONDITION QT_FEATURE_dlopen OR WIN32 OR NOT QT_FEATURE_shared ) qt_feature("intelcet" PRIVATE - LABEL "Using Intel CET" + LABEL "Using Intel Control-flow Enforcement Technology (CET)" CONDITION ( INPUT_intelcet STREQUAL yes ) OR TEST_intelcet ) qt_configure_add_summary_build_type_and_config()