diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-24 18:28:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 00:01:12 +0000 |
| commit | f86986f61b04e5a3bfc65b734d532c87b7a82631 (patch) | |
| tree | acaa2e9b99b380dfa7a387bd1de1bffa551c605a | |
| parent | 2061c23ba1766895a2b9faa03851fbb5a88c4d21 (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>
| -rw-r--r-- | cmake/QtBuild.cmake | 7 | ||||
| -rw-r--r-- | cmake/QtScopeFinalizerHelpers.cmake | 38 |
2 files changed, 31 insertions, 14 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() diff --git a/cmake/QtScopeFinalizerHelpers.cmake b/cmake/QtScopeFinalizerHelpers.cmake index bd0775e059..59e89cc9e2 100644 --- a/cmake/QtScopeFinalizerHelpers.cmake +++ b/cmake/QtScopeFinalizerHelpers.cmake @@ -1,24 +1,38 @@ # Add a finalizer function for the current CMake list file. +# It will be processed just before leaving the current source directory scope. # +# When using CMake 3.18 or lower: # You may add up to nine arguments that are passed to the finalizer. # A finalizer that is registered with qt_add_list_file_finalizer(foo bar baz) # will be called with nine arguments: foo(bar baz IGNORE IGNORE IGNORE...), # because CMake's handling of empty list elements is a cruel joke. -# # For CMake < 3.18 the function qt_watch_current_list_dir must know about the finalizer. +# +# When using CMake 3.19 or higher, no more INGORE parameters are passed. Instead we +# use cmake_language(DEFER CALL) and pass arguments as usual. +# qt_watch_current_list_dir also doesn't need to know about the finalizer function(qt_add_list_file_finalizer func) - set_property(GLOBAL APPEND - PROPERTY QT_LIST_FILE_FINALIZER_FILES "${CMAKE_CURRENT_LIST_FILE}") - set_property(GLOBAL APPEND - PROPERTY QT_LIST_FILE_FINALIZER_FUNCS ${func}) - foreach(i RANGE 1 9) - set(arg "${ARGV${i}}") - if(i GREATER_EQUAL ARGC OR "${arg}" STREQUAL "") - set(arg "IGNORE") - endif() + set(use_cmake_defer_call TRUE) + if(CMAKE_VERSION VERSION_LESS "3.19.0") + set(use_cmake_defer_call FALSE) + endif() + + if(use_cmake_defer_call) + cmake_language(EVAL CODE "cmake_language(DEFER CALL \"${func}\" ${ARGN}) ") + else() set_property(GLOBAL APPEND - PROPERTY QT_LIST_FILE_FINALIZER_ARGV${i} "${arg}") - endforeach() + PROPERTY QT_LIST_FILE_FINALIZER_FILES "${CMAKE_CURRENT_LIST_FILE}") + set_property(GLOBAL APPEND + PROPERTY QT_LIST_FILE_FINALIZER_FUNCS ${func}) + foreach(i RANGE 1 9) + set(arg "${ARGV${i}}") + if(i GREATER_EQUAL ARGC OR "${arg}" STREQUAL "") + set(arg "IGNORE") + endif() + set_property(GLOBAL APPEND + PROPERTY QT_LIST_FILE_FINALIZER_ARGV${i} "${arg}") + endforeach() + endif() endfunction() # Watcher function for the variable CMAKE_CURRENT_LIST_DIR. |