summaryrefslogtreecommitdiffstats
path: root/cmake/QtBuild.cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-24 18:28:01 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-26 00:01:12 +0000
commitf86986f61b04e5a3bfc65b734d532c87b7a82631 (patch)
treeacaa2e9b99b380dfa7a387bd1de1bffa551c605a /cmake/QtBuild.cmake
parent2061c23ba1766895a2b9faa03851fbb5a88c4d21 (diff)
CMake: Use cmake_language(DEFER) when available for scope finalizers
If CMake version is 3.19 or greater, use cmake_language(DEFER CALL) for Qt internal scope finalizers, instead of the homegrown implementation. Apart from not depending on the hacky homegrown solution, it significantly improves the readability of --trace-redirect logs. Task-number: QTBUG-77377 Change-Id: I5ce374bb313865662c536826e86052bc762438b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 69d9b2b6fdd5cd28aa7dca2636eb2f411277ad30) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/QtBuild.cmake')
-rw-r--r--cmake/QtBuild.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 85e437033b..da43d5bc56 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -494,5 +494,8 @@ if(ANDROID)
include(QtAndroidHelpers)
endif()
-# This sets up the scope finalizer mechanism.
-variable_watch(CMAKE_CURRENT_LIST_DIR qt_watch_current_list_dir)
+# This sets up the poor man's scope finalizer mechanism.
+# For newer CMake versions, we use cmake_language(DEFER CALL) instead.
+if(CMAKE_VERSION VERSION_LESS "3.19.0")
+ variable_watch(CMAKE_CURRENT_LIST_DIR qt_watch_current_list_dir)
+endif()