diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-07-09 23:54:11 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-07-14 01:22:40 +1000 |
| commit | 5acf1735f7f497662c6ebe43220489dc81785ec6 (patch) | |
| tree | 2d54c7783211e3e9e8f45945b5e5be4dd7e69de9 /modules | |
| parent | 032b4c4baaaff5fde1243864149d33f545767b5c (diff) | |
| download | extra-cmake-modules-5acf1735f7f497662c6ebe43220489dc81785ec6.tar.gz extra-cmake-modules-5acf1735f7f497662c6ebe43220489dc81785ec6.tar.bz2 | |
Don't search default paths when finding lconvert.
Otherwise, if lconvert exists in normal system paths (eg. /usr/bin) that one
will be used instead of the one alongside Qt5::lrelease. This could cause Qt4
lconvert to be incorrectly used on some systems.
REVIEW: 119198
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ECMCreateQmFromPoFiles.cmake | 1 | ||||
| -rw-r--r-- | modules/ECMPoQmTools.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/modules/ECMCreateQmFromPoFiles.cmake b/modules/ECMCreateQmFromPoFiles.cmake index 4a31a93e..b66e5989 100644 --- a/modules/ECMCreateQmFromPoFiles.cmake +++ b/modules/ECMCreateQmFromPoFiles.cmake @@ -113,6 +113,7 @@ function(_ECM_QM_CREATE_TARGET install_destination catalog_name) find_program(lconvert_executable NAMES lconvert-qt5 lconvert PATHS ${lrelease_path} + NO_DEFAULT_PATH ) if (catalog_name) diff --git a/modules/ECMPoQmTools.cmake b/modules/ECMPoQmTools.cmake index 3ce69581..74dc6563 100644 --- a/modules/ECMPoQmTools.cmake +++ b/modules/ECMPoQmTools.cmake @@ -129,6 +129,7 @@ function(ecm_process_po_files_as_qm lang) find_program(lconvert_executable NAMES lconvert-qt5 lconvert PATHS ${lrelease_path} + NO_DEFAULT_PATH ) # Create commands to turn po files into qm files |