diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 567d5f2475..508b58f7ae 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1687,7 +1687,6 @@ function(_qt_internal_process_resource target resourceName) string(REPLACE "/" "_" resourceName ${resourceName}) string(REPLACE "." "_" resourceName ${resourceName}) - set(output_targets "") set(resource_files ${rcc_FILES}) if(NOT "${rcc_BASE}" STREQUAL "") get_filename_component(abs_base "${rcc_BASE}" ABSOLUTE) @@ -1710,11 +1709,10 @@ function(_qt_internal_process_resource target resourceName) if (NOT resource_files) if (rcc_OUTPUT_TARGETS) - set(${rcc_OUTPUT_TARGETS} "${output_target_quick}" PARENT_SCOPE) + set(${rcc_OUTPUT_TARGETS} "" PARENT_SCOPE) endif() return() endif() - list(APPEND output_targets ${output_target_quick}) set(generatedBaseName "${resourceName}") set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${generatedBaseName}.qrc") @@ -1809,6 +1807,7 @@ function(_qt_internal_process_resource target resourceName) COMMENT "Running rcc for resource ${resourceName}" VERBATIM) + set(output_targets "") if(isBinary) # Add generated .rcc target to 'all' set add_custom_target(binary_resource_${generatedBaseName} ALL DEPENDS "${generatedOutfile}") @@ -1816,11 +1815,10 @@ function(_qt_internal_process_resource target resourceName) set_property(SOURCE "${generatedOutfile}" PROPERTY SKIP_AUTOGEN ON) set_property(TARGET ${target} APPEND PROPERTY _qt_generated_qrc_files "${generatedResourceFile}") - __qt_propagate_generated_resource(${target} ${resourceName} "${generatedOutfile}" output_target) - list(APPEND output_targets ${output_target}) - if (rcc_OUTPUT_TARGETS) - set(${rcc_OUTPUT_TARGETS} "${output_targets}" PARENT_SCOPE) - endif() + __qt_propagate_generated_resource(${target} ${resourceName} "${generatedOutfile}" output_targets) + endif() + if (rcc_OUTPUT_TARGETS) + set(${rcc_OUTPUT_TARGETS} "${output_targets}" PARENT_SCOPE) endif() endfunction()