1*4882a593SmuzhiyunFrom c4d1caad764372d2a852fb837e7c37e168c65f0c Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Samuli Piippo <samuli.piippo@qt.io> 3*4882a593SmuzhiyunDate: Mon, 18 Feb 2019 10:45:03 +0200 4*4882a593SmuzhiyunSubject: [PATCH] linguist-tools cmake: allow overriding the location for 5*4882a593Smuzhiyun lupdate and lrelease 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunUpstream-Status: Pending 8*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun src/linguist/Qt5LinguistToolsConfig.cmake.in | 6 +++--- 11*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in 14*4882a593Smuzhiyunindex 2e99bc76..e6f4f7ed 100644 15*4882a593Smuzhiyun--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in 16*4882a593Smuzhiyun+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in 17*4882a593Smuzhiyun@@ -47,7 +47,7 @@ if (NOT TARGET Qt5::lrelease) 18*4882a593Smuzhiyun !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 19*4882a593Smuzhiyun set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") 20*4882a593Smuzhiyun !!ELSE 21*4882a593Smuzhiyun- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") 22*4882a593Smuzhiyun+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease${OE_QMAKE_BIN_SUFFIX}\") 23*4882a593Smuzhiyun !!ENDIF 24*4882a593Smuzhiyun _qt5_LinguistTools_check_file_exists(${imported_location}) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun@@ -62,7 +62,7 @@ if (NOT TARGET Qt5::lupdate) 27*4882a593Smuzhiyun !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 28*4882a593Smuzhiyun set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") 29*4882a593Smuzhiyun !!ELSE 30*4882a593Smuzhiyun- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") 31*4882a593Smuzhiyun+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate${OE_QMAKE_BIN_SUFFIX}\") 32*4882a593Smuzhiyun !!ENDIF 33*4882a593Smuzhiyun _qt5_LinguistTools_check_file_exists(${imported_location}) 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun@@ -77,7 +77,7 @@ if (NOT TARGET Qt5::lconvert) 36*4882a593Smuzhiyun !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 37*4882a593Smuzhiyun set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") 38*4882a593Smuzhiyun !!ELSE 39*4882a593Smuzhiyun- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") 40*4882a593Smuzhiyun+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert${OE_QMAKE_BIN_SUFFIX}\") 41*4882a593Smuzhiyun !!ENDIF 42*4882a593Smuzhiyun _qt5_LinguistTools_check_file_exists(${imported_location}) 43*4882a593Smuzhiyun 44