summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2024-03-20 11:51:50 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-22 00:57:31 +0000
commit3f1ddd1068509e794c30fb9263cda997e63683ba (patch)
treee0862da3fd2e42dab679a2f036e4e87a6e5e2efa /cmake
parent382505e22f9037a13f793786c2b12c3f68bc2724 (diff)
CMake: Reconfigure whenever module EXTRA_FILES are touched
Otherwise the touched files will not be re-copied and re-installed until an explicit rerun of cmake. Change-Id: I5abb752b45d8b33885a59363fe987225a89e713a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 07e7340c0d82a33b7b112cb7c3a2a719ad2ec9c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtModuleHelpers.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index 6669ba97e0..45e59cf642 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -719,6 +719,9 @@ set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)")
get_filename_component(basename ${cmake_file} NAME)
file(COPY ${cmake_file} DESTINATION ${config_build_dir})
list(APPEND extra_cmake_files "${config_build_dir}/${basename}")
+
+ # Make sure touched extra cmake files cause a reconfigure, so they get re-copied.
+ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${cmake_file}")
endforeach()
list(APPEND extra_cmake_includes ${arg_EXTRA_CMAKE_INCLUDES})