diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2015-03-06 12:13:38 +0100 |
|---|---|---|
| committer | Harald Sitter <sitter@kde.org> | 2015-03-06 12:14:56 +0100 |
| commit | bc27ee561756cb6e1e51e3589addab8656fd4b03 (patch) | |
| tree | 6751e74c5fc9e6246f7a5e2030521528ddea71cb /modules/ECMCreateQmFromPoFiles.cmake | |
| parent | 0466f8f95e214d91b17ef078be221c6d0025e466 (diff) | |
| download | extra-cmake-modules-bc27ee561756cb6e1e51e3589addab8656fd4b03.tar.gz extra-cmake-modules-bc27ee561756cb6e1e51e3589addab8656fd4b03.tar.bz2 | |
Use lconvert path from Qt cmake config when on Qt >= 5.3.1v1.8.0-rc1v1.8.0
Qt5LinguistToolsConfig.cmake defines CMake target for lconvert since Qt 5.3.1,
so we should use that if it is available.
Our own hacks were not working in some configurations (i.e. when there is
/usr/bin/lconvert managed by qtchooser, but no qtchooser configuration file).
REVIEW: 122626
Diffstat (limited to 'modules/ECMCreateQmFromPoFiles.cmake')
| -rw-r--r-- | modules/ECMCreateQmFromPoFiles.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/modules/ECMCreateQmFromPoFiles.cmake b/modules/ECMCreateQmFromPoFiles.cmake index 3f134fbb..afd6f786 100644 --- a/modules/ECMCreateQmFromPoFiles.cmake +++ b/modules/ECMCreateQmFromPoFiles.cmake @@ -110,13 +110,18 @@ endfunction() function(_ECM_QM_CREATE_TARGET install_destination catalog_name) # Find lconvert - get_target_property(lrelease_location Qt5::lrelease LOCATION) - get_filename_component(lrelease_path ${lrelease_location} PATH) - find_program(lconvert_executable - NAMES lconvert-qt5 lconvert - PATHS ${lrelease_path} - NO_DEFAULT_PATH - ) + if(TARGET Qt5::lconvert) + set(lconvert_executable Qt5::lconvert) + else() + # Qt < 5.3.1 does not define Qt5::lconvert + get_target_property(lrelease_location Qt5::lrelease LOCATION) + get_filename_component(lrelease_path ${lrelease_location} PATH) + find_program(lconvert_executable + NAMES lconvert-qt5 lconvert + PATHS ${lrelease_path} + NO_DEFAULT_PATH + ) + endif() if (catalog_name) set(install_args RENAME ${catalog_name}.qm) |