diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-20 10:19:32 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-20 17:07:53 +0200 |
| commit | 729d102b1c5273087c54d1584c80f1a1e6eef86c (patch) | |
| tree | 1d5ab5f1d52d29f148a1615f2316f3d953089d5c /cmake | |
| parent | 2f1a55c0b13ea02619f0d209a2b710fb7cbe8a1a (diff) | |
CMake: Implement configure -optimize-debug
Task-number: QTBUG-85373
Change-Id: I3aba1fcf96e36544dd75a5e6adc5f770a9a45726
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 3c8692a903..63cb264d32 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -180,7 +180,9 @@ macro(qt_enable_cmake_languages) endif() endforeach() - qt_internal_set_up_config_optimizations_like_in_qmake() + if(NOT PROJECT_NAME STREQUAL "QtBase") + qt_internal_set_up_config_optimizations_like_in_qmake() + endif() endmacro() # Minimum setup required to have any CMakeList.txt build as as a standalone diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index cddaa0da39..29453e2943 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -356,6 +356,11 @@ function(qt_internal_set_up_config_optimizations_like_in_qmake) endif() endif() + # Debug should get the OPTIMIZE_DEBUG flag if the respective feature is ON. + if(config STREQUAL "DEBUG" AND QT_FEATURE_optimize_debug) + string(APPEND "${flag_var_name}" " ${QT_CFLAGS_OPTIMIZE_DEBUG}") + endif() + # Assign value to the cache entry. get_property(help_text CACHE "${flag_var_name}" PROPERTY HELPSTRING) set("${flag_var_name}" "${${flag_var_name}}" CACHE STRING "${help_text}" FORCE) |