From 3f1ddd1068509e794c30fb9263cda997e63683ba Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 20 Mar 2024 11:51:50 +0100 Subject: [PATCH] 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 (cherry picked from commit 07e7340c0d82a33b7b112cb7c3a2a719ad2ec9c3) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtModuleHelpers.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 6669ba97e0e..45e59cf6423 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})