From cfd5485d41b2bf519d5b3c5162726cce195782ac Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 13 May 2022 19:14:20 +0200 Subject: [PATCH] CMake: Change QT_RESOURCE_TARGET_DEPENDENCY property to be internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename the property to _qt_resource_target_dependency and make sure we also consider which scope we are getting the source file property from if the CMake version is recent enough. Pick-to: 6.3 Task-number: QTBUG-103470 Change-Id: I755413c91bc0bc9033760a888927b60c470c562b Reviewed-by: Jörg Bornemann --- src/corelib/Qt6CoreMacros.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index aaa80d55d58..d0bd93d67f4 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2117,7 +2117,12 @@ function(_qt_internal_process_resource target resourceName) string(APPEND qrcContents "${file}\n") list(APPEND files "${file}") - get_source_file_property(target_dependency ${file} QT_RESOURCE_TARGET_DEPENDENCY) + set(scope_args) + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.18") + set(scope_args TARGET_DIRECTORY ${target}) + endif() + get_source_file_property( + target_dependency ${file} ${scope_args} _qt_resource_target_dependency) if (NOT target_dependency) list(APPEND resource_dependencies ${file}) else()