extra-cmake-modules: fix for linguist on cross

This commit is contained in:
Đoàn Trần Công Danh 2025-08-19 06:22:17 +07:00
parent ee32ce64e1
commit 29fedb4204
3 changed files with 13 additions and 12 deletions

View file

@ -9,3 +9,15 @@
set(_exec_name_text "Qt6 qtpaths")
if (TARGET Qt6::qtpaths)
get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
--- a/modules/ECMPoQmTools.cmake
+++ b/modules/ECMPoQmTools.cmake
@@ -150,6 +150,9 @@ function(ecm_process_po_files_as_qm lang
if (QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5LinguistTools CONFIG REQUIRED)
else()
+ # Find Linguist in target environment, and this Linguist will
+ # find LinguistTools via Qt6_HOST_PATH
+ find_package(Qt6 OPTIONAL_COMPONENTS Linguist CONFIG REQUIRED)
find_package(Qt6 COMPONENTS LinguistTools CONFIG REQUIRED)
endif()

View file

@ -1,7 +1,7 @@
# Template file for 'extra-cmake-modules'
pkgname=extra-cmake-modules
version=6.14.0
revision=1
revision=2
build_style=cmake
configure_args="-DBUILD_HTML_DOCS=ON -DBUILD_TESTING=ON"
hostmakedepends="python3-Sphinx qt6-base qt6-tools qt6-plugin-sqlite

View file

@ -1,11 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ endif()
if(PHONON_BUILD_QT6)
list(APPEND VERSIONS "6")
set(BUILD_WITH_QT6 ON) # necessary on older ECMs
+ # Avoid looking LinguistTools in target
+ find_package(Qt6 COMPONENTS Linguist)
endif()
# Not set by ECM (yet)