diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-30 12:09:46 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-30 12:35:23 +0000 |
commit | e07858ad252c69bc412a7368df02ee16d138c897 (patch) | |
tree | 2ea5dcfc73eae4226562a15c9f87252190f9feb5 | |
parent | 24aed8f15069f4f88284fe51e4487116241b9c4f (diff) |
CMake: Fix output argument forwarding of qt_add_(lrelease|translations)
Make both functions macros to allow for the forwarding of the output
arguments QM_FILES_OUTPUT_VARIABLE and OUTPUT_TARGETS.
Fixes: QTBUG-96096
Change-Id: Iaec761b12e3330ea728f8797314a7923d4001fa7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit e4ac6d0fb83b5086bd0864278fa80204ed279306)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/linguist/Qt6LinguistToolsMacros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/linguist/Qt6LinguistToolsMacros.cmake b/src/linguist/Qt6LinguistToolsMacros.cmake index aa7bb69c1..449472e8a 100644 --- a/src/linguist/Qt6LinguistToolsMacros.cmake +++ b/src/linguist/Qt6LinguistToolsMacros.cmake @@ -348,18 +348,18 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) message(FATAL_ERROR "qt_add_lupdate() is only available in Qt 6.") endif() endfunction() - function(qt_add_lrelease) + macro(qt_add_lrelease) if(QT_DEFAULT_MAJOR_VERSION EQUAL 6) qt6_add_lrelease(${ARGN}) else() message(FATAL_ERROR "qt_add_lrelease() is only available in Qt 6.") endif() - endfunction() - function(qt_add_translations) + endmacro() + macro(qt_add_translations) if(QT_DEFAULT_MAJOR_VERSION EQUAL 6) qt6_add_translations(${ARGN}) else() message(FATAL_ERROR "qt_add_translations() is only available in Qt 6.") endif() - endfunction() + endmacro() endif() |