From e559da3c6a11a695a0b8d285bd5494a1a4c38754 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 5 Nov 2020 11:14:17 +0100 Subject: CMake: Fix detection of the ltcg feature When checking the value of CMAKE_INTERPROCEDURAL_OPTIMIZATION_, then must be the upper case configuration name. Also, we must not unset __qt_ltcg_detected, because the feature condition evaluation happens way after the feature definition, and __qt_ltcg_detected was not available anymore there. This commit amends 96bdcdacbc0. Fixes: QTBUG-87874 Change-Id: I2b555bd1d7fbc8973e1d9493045c27d61b0d2c1b Reviewed-by: Alexandru Croitor --- .prev_configure.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.prev_configure.cmake') diff --git a/.prev_configure.cmake b/.prev_configure.cmake index 1ee218646b..3390c85588 100644 --- a/.prev_configure.cmake +++ b/.prev_configure.cmake @@ -621,18 +621,19 @@ if(CMAKE_INTERPROCEDURAL_OPTIMIZATION) set(__qt_ltcg_detected TRUE) else() foreach(config ${CMAKE_BUILD_TYPE} ${CMAKE_CONFIGURATION_TYPES}) - if(CMAKE_INTERPROCEDURAL_OPTIMIZATION_${config}) + string(TOUPPER "${config}" __qt_uc_config) + if(CMAKE_INTERPROCEDURAL_OPTIMIZATION_${__qt_uc_config}) set(__qt_ltcg_detected TRUE) break() endif() endforeach() + unset(__qt_uc_config) endif() qt_feature("ltcg" LABEL "Using LTCG" AUTODETECT ON CONDITION __qt_ltcg_detected ) -unset(__qt_ltcg_detected) qt_feature_config("ltcg" QMAKE_PRIVATE_CONFIG) qt_feature("enable_gdb_index" LABEL "Generating GDB index" -- cgit v1.2.3