diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-20 10:44:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-09-20 10:06:07 +0000 |
| commit | 2ee974b892f905fcc2a0f4f4eee672c11d07139d (patch) | |
| tree | 77128ac26be8d7ae7c10b74aaf1feecaffd32b37 /cmake/QtResource.cmake.in | |
| parent | d245ba48e75cd3de08d7e3d2b2d5186794a4d1a9 (diff) | |
cmake: Support passing extra arguments to rcc
qt6_add_resources already supported the OPTIONS multi value parameter,
but only for the non-target case. Use the same parameter for the target
case.
Change-Id: Ib5fcb976ecbac244c3b11073b3cdd0c5c6366a87
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'cmake/QtResource.cmake.in')
| -rw-r--r-- | cmake/QtResource.cmake.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/QtResource.cmake.in b/cmake/QtResource.cmake.in index 894269b1e0..a62930f572 100644 --- a/cmake/QtResource.cmake.in +++ b/cmake/QtResource.cmake.in @@ -186,7 +186,7 @@ endfunction() # function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName) - cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE;OUTPUT_TARGETS" "FILES" ${ARGN}) + cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE;OUTPUT_TARGETS" "FILES;OPTIONS" ${ARGN}) string(REPLACE "/" "_" resourceName ${resourceName}) string(REPLACE "." "_" resourceName ${resourceName}) @@ -268,11 +268,16 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName) file(GENERATE OUTPUT "${generatedResourceFile}" CONTENT "${qrcContents}") + set(rccArgs --name "${newResourceName}" + --output "${generatedSourceCode}" "${generatedResourceFile}") + if(rcc_OPTIONS) + list(APPEND rccArgs ${rcc_OPTIONS}) + endif() + # Process .qrc file: add_custom_command(OUTPUT "${generatedSourceCode}" COMMAND "@QT_CMAKE_EXPORT_NAMESPACE@::rcc" - ARGS --name "${newResourceName}" - --output "${generatedSourceCode}" "${generatedResourceFile}" + ARGS ${rccArgs} DEPENDS ${resources} ${generatedResourceFile} COMMENT "RCC ${newResourceName}" VERBATIM) |