diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-09-16 09:49:40 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-09-16 11:41:48 +0000 |
| commit | 21dd3624a5897175f6a78e25a09163f14e6baab8 (patch) | |
| tree | 51676eda86e23f40cb53ca3a45330d6e22c78273 /src/corelib/Qt6CoreMacros.cmake | |
| parent | 5884f793b9248d95a923a33663aa26386a6c4bbd (diff) | |
Fix OUTPUT_TARGET propagation in qt6_add_resource()
Value was not being propagated to the parent scope when set.
This patch also changes OUTPUT_TARGET to OUTPUT_TARGETS since it is
possible that two targets can be generated.
Change-Id: If489a609ed363a319224fcd6c5a4fc878d0d8617
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 060c69e8de..c4b6baa4ad 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -262,7 +262,11 @@ endfunction() function(QT6_ADD_RESOURCES outfiles ) if (TARGET ${outfiles}) + cmake_parse_arguments(arg "" "OUTPUT_TARGETS" "" ${ARGN}) QT6_PROCESS_RESOURCE(${ARGV}) + if (arg_OUTPUT_TARGETS) + set(${arg_OUTPUT_TARGETS} ${${arg_OUTPUT_TARGETS}} PARENT_SCOPE) + endif() else() set(options) set(oneValueArgs) |