summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-06-24 14:18:28 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-24 17:19:40 +0000
commit30e941a75cd108cbba5124486387d3b2034d0cac (patch)
tree47917750bb5be9406830bd9e9bd04249f905d198 /cmake
parent69e78ceff2cb8ab744709278fdf1231a0a584b4f (diff)
Disable forced full optimization if QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON
Task-number: QTBUG-94753 Change-Id: Ib9dda1a96f3123394e3b3d4f84feac8cedd18b89 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1cb63fcc97e2b114996e25e679b167cb5d392c60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtFlagHandlingHelpers.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
index 4679a00a1a..dc81a79333 100644
--- a/cmake/QtFlagHandlingHelpers.cmake
+++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -671,6 +671,11 @@ function(qt_internal_add_optimize_full_flags)
""
${ARGN})
+ # QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS disables forced full optimization.
+ if(QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS)
+ return()
+ endif()
+
# Assume that FEATURE_optimize_full has higher priority. But if FEATURE_optimize_full is OFF,
# flags are set by FEATURE_optimize_size should remain unchanged.
if(QT_FEATURE_optimize_size AND NOT QT_FEATURE_optimize_full)