summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-01-24 20:13:21 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-01-27 16:15:36 +0100
commit314a0453dea29de5dc70a829b330af87d7f1f565 (patch)
tree2806de76c2e85cc746c3608f09ebfcb1ccf68a47 /modules
parentdf070851a5799c998079a1ead25bf80c20d34d76 (diff)
downloadtde-cmake-314a0453dea29de5dc70a829b330af87d7f1f565.tar.gz
tde-cmake-314a0453dea29de5dc70a829b330af87d7f1f565.zip
tde_create_translated_desktop: Use find_file instead of find_program
to find tde_l10n_merge.pl because it does not have the executable bit set. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 52001b90693f0c986d6aa2ceec69f9b8fa7b8699)
Diffstat (limited to 'modules')
-rw-r--r--modules/TDEMacros.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index b49fdb9..c821e7f 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -1877,13 +1877,13 @@ macro( tde_create_translated_desktop )
include( FindPerl )
endif( )
if( NOT INTLTOOL_MERGE_EXECUTABLE )
- find_program( INTLTOOL_MERGE_EXECUTABLE
+ find_file( INTLTOOL_MERGE_EXECUTABLE
NAMES tde_l10n_merge.pl
HINTS ${TDE_CMAKE_MODULES}
)
if( "${INTLTOOL_MERGE_EXECUTABLE}" STREQUAL "INTLTOOL_MERGE_EXECUTABLE-NOTFOUND" )
- #tde_message_fatal( "xgettext >= 0.19 or intltool-merge is required but not found" )
- tde_message_fatal( "intltool-merge is required but not found" )
+ #tde_message_fatal( "xgettext >= 0.19 or tde_l10n_merge.pl is required but not found" )
+ tde_message_fatal( "tde_l10n_merge.pl is required but not found" )
endif( )
message( STATUS "Found intltool: ${INTLTOOL_MERGE_EXECUTABLE}" )
endif( )