diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-05 11:14:17 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-06 22:03:50 +0100 |
| commit | e559da3c6a11a695a0b8d285bd5494a1a4c38754 (patch) | |
| tree | 2a5a450f2f5796c96ba7915b94173a5c3b2c8252 /util | |
| parent | e31c6c7337477fa708e09311667ed3a8ace1b6b0 (diff) | |
CMake: Fix detection of the ltcg feature
When checking the value of CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>,
then <CONFIG> 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 <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index d81121b98f..29afd777e7 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -920,14 +920,15 @@ 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()""", - "condition": "__qt_ltcg_detected", - "cmakeEpilogue": "unset(__qt_ltcg_detected)" + "condition": "__qt_ltcg_detected" }, "msvc_mp": None, "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"}, |