diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPublicAndroidHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtTargetHelpers.cmake | 16 | ||||
| -rw-r--r-- | cmake/QtToolHelpers.cmake | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/cmake/QtPublicAndroidHelpers.cmake b/cmake/QtPublicAndroidHelpers.cmake index 30ffec43ad8..dbaf01f0359 100644 --- a/cmake/QtPublicAndroidHelpers.cmake +++ b/cmake/QtPublicAndroidHelpers.cmake @@ -67,7 +67,7 @@ function(_qt_internal_locate_android_jar) # This variable specifies the API level used for building Java code, it can be the same as Qt # for Android's maximum supported Android version or higher. if(NOT QT_ANDROID_API_USED_FOR_JAVA) - set(QT_ANDROID_API_USED_FOR_JAVA "android-35") + set(QT_ANDROID_API_USED_FOR_JAVA "android-36") endif() set(jar_location "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_USED_FOR_JAVA}/android.jar") diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index dc433be1863..10d60807212 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -2065,3 +2065,19 @@ function(qt_internal_workaround_static_lib_gcc_lto_issue target) target_compile_options("${target}" PRIVATE "${flag_wrapped}") endif() endfunction() + +# Enable LTO for the debug configuration of optimized tool or library targets. +# Can be opted out via various options. +function(qt_internal_enable_optimized_tools_lto target) + string(TOLOWER "${PROJECT_NAME}" project_name_lower) + + if(QT_FEATURE_optimized_tools + AND NOT QT_FORCE_NO_OPTIMIZED_TOOLS_LTO + AND NOT QT_FORCE_NO_OPTIMIZE_${target} + AND NOT QT_FORCE_NO_OPTIMIZE_${project_name_lower} + AND NOT QT_FORCE_NO_LTO_${target} + AND NOT QT_FORCE_NO_LTO_${project_name_lower} + ) + set_target_properties("${target}" PROPERTIES INTERPROCEDURAL_OPTIMIZATION_DEBUG ON) + endif() +endfunction() diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index e55a8e7a480..16743dcd9eb 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -293,6 +293,7 @@ function(qt_internal_add_tool target_name) qt_internal_install_pdb_files(${target_name} "${install_dir}") qt_internal_add_target_optimized_flags_for_debug_config_in_parent_scope("${target_name}") + qt_internal_enable_optimized_tools_lto("${target_name}") if(QT_GENERATE_SBOM) _qt_internal_forward_function_args( |