Browse Source

tde_create_translated_desktop: Force the use of intltool-merge.

Because some of our desktop files contain underscores in variable
names (for example eventsrc), which is not an allowed character
for names of entries in desktop style files, we can't use msgfmt,
so we need intltool-merge.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/44/head
Slávek Banko 4 months ago
parent
commit
34e3154c44
No known key found for this signature in database GPG Key ID: 608F5293A04BE668
1 changed files with 14 additions and 5 deletions
  1. +14
    -5
      modules/TDEMacros.cmake

+ 14
- 5
modules/TDEMacros.cmake View File

@@ -1782,18 +1782,27 @@ macro( tde_create_translated_desktop )
endforeach( )

# select a tool for merging desktop file translations
if( NOT MSGFMT_EXECUTABLE OR NOT MSGFMT_VERSION )
tde_setup_msgfmt( )
endif( )
if( "${MSGFMT_VERSION}" VERSION_LESS "0.19" )
#
# Because some of our desktop files contain underscores in variable
# names (for example eventsrc), which is not an allowed character
# for names of entries in desktop style files, we can't use msgfmt,
# so we need intltool-merge.
#
#if( NOT MSGFMT_EXECUTABLE OR NOT MSGFMT_VERSION )
# tde_setup_msgfmt( )
#endif( )
#if( "${MSGFMT_VERSION}" VERSION_LESS "0.19" )
if( TRUE )
if( NOT INTLTOOL_MERGE_EXECUTABLE )
find_program( INTLTOOL_MERGE_EXECUTABLE
NAMES intltool-merge
HINTS "${TDE_PREFIX}/bin"
)
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( "xgettext >= 0.19 or intltool-merge is required but not found" )
tde_message_fatal( "intltool-merge is required but not found" )
endif( )
message( STATUS "Found intltool: ${INTLTOOL_MERGE_EXECUTABLE}" )
endif( )
set( DESKTOP_MERGE_INTLTOOL 1 )
else( )


Loading…
Cancel
Save