PKGBUILDs/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch

45 lines
1.8 KiB
Diff
Raw Normal View History

2023-04-10 18:43:52 +02:00
From 526d7e1fbdd80578a112c2c67ead312278321769 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 25 Sep 2016 21:44:42 +0200
2019-03-16 16:58:50 +01:00
Subject: [PATCH] Fix linguist macro
- Prevent CMake appending extra 'Qt5::lupdate'/'Qt5::lrelease' to
command line when invoking lupdate/lrelease
- Achieved by resolveing the IMPORTED_LOCATION manually
2023-04-10 18:43:52 +02:00
Change-Id: Ie502d6237f0fed14f377912463f394c8d6ae396d
---
2023-04-10 18:43:52 +02:00
src/linguist/Qt5LinguistToolsMacros.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
2023-04-10 18:43:52 +02:00
index 6a45e57be..c034f2749 100644
--- a/src/linguist/Qt5LinguistToolsMacros.cmake
+++ b/src/linguist/Qt5LinguistToolsMacros.cmake
2023-04-10 18:43:52 +02:00
@@ -96,8 +96,9 @@ function(QT5_CREATE_TRANSLATION _qm_files)
file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
endif()
2023-04-10 18:43:52 +02:00
set(stamp_file "${stamp_file_dir}/${_ts_name}.stamp")
+ get_target_property(LUPDATE_LOC ${Qt5_LUPDATE_EXECUTABLE} IMPORTED_LOCATION)
2023-04-10 18:43:52 +02:00
add_custom_command(OUTPUT ${stamp_file}
- COMMAND ${Qt5_LUPDATE_EXECUTABLE}
+ COMMAND ${LUPDATE_LOC}
ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
2023-04-10 18:43:52 +02:00
COMMAND ${CMAKE_COMMAND} -E touch "${stamp_file}"
2021-04-13 12:24:25 +02:00
DEPENDS ${_dependencies}
2023-04-10 18:43:52 +02:00
@@ -146,9 +147,9 @@ function(QT5_ADD_TRANSLATION _qm_files)
else()
set(qm_dep "${_abs_FILE}")
endif()
2023-04-10 18:43:52 +02:00
-
+ get_target_property(LRELEASE_LOC ${Qt5_LRELEASE_EXECUTABLE} IMPORTED_LOCATION)
add_custom_command(OUTPUT ${qm}
- COMMAND ${Qt5_LRELEASE_EXECUTABLE}
+ COMMAND ${LRELEASE_LOC}
ARGS ${_LRELEASE_OPTIONS} ${_abs_FILE} -qm ${qm}
2023-04-10 18:43:52 +02:00
DEPENDS ${qm_dep} VERBATIM
)
--
2023-04-10 18:43:52 +02:00
2.40.0