From 28260f0078b016aac7f9b924c424bc1ae7d157fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 6 Dec 2020 14:39:23 +0100 Subject: [PATCH] tde_create_translated_desktop: Show the full path of the source desktop file when merging translations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- modules/TDEMacros.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake index 80cd4c5..389c5e3 100644 --- a/modules/TDEMacros.cmake +++ b/modules/TDEMacros.cmake @@ -1903,6 +1903,7 @@ macro( tde_create_translated_desktop ) # get a base name and a directory get_filename_component( _basename ${_src} ABSOLUTE ) get_filename_component( _basedir ${_basename} PATH ) + file( RELATIVE_PATH _sourcename "${CMAKE_SOURCE_DIR}" "${_basename}" ) file( RELATIVE_PATH _basename "${CMAKE_CURRENT_SOURCE_DIR}" "${_basename}" ) # prepare the binary directory according to source directory @@ -1989,6 +1990,7 @@ macro( tde_create_translated_desktop ) OUTPUT ${_basename} COMMAND ${CMAKE_COMMAND} -E env "LINGUAS=${_linguas}" ${MSGFMT_EXECUTABLE} --desktop --template ${_src} -d ${_po_dir} -o ${_basename} ${_keywords_arg} DEPENDS ${_src} + COMMENT "Merging translations into ${_sourcename}" ) else( ) @@ -2002,8 +2004,9 @@ macro( tde_create_translated_desktop ) # merge translations command add_custom_command( OUTPUT ${_basename} - COMMAND ${INTLTOOL_MERGE_EXECUTABLE} -d ${_po_dir} ${_basename}.in ${_basename} + COMMAND ${INTLTOOL_MERGE_EXECUTABLE} -q -d ${_po_dir} ${_basename}.in ${_basename} DEPENDS ${_src} + COMMENT "Merging translations into ${_sourcename}" ) endif( )