Remove second call tm msgmerge' The diffs in created po-files

were because of the sort-flag in for msgmerge.

Now the outcome is identical to automake.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34934 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake
index 5a747f5909338a2297e1c5eec1dab4df9e03be7d..1ca0cfbfd378b6c94a318f12acc200fac3095bc6 100755 (executable)
--- a/development/cmake/modules/FindLyXGettext.cmake
+++ b/development/cmake/modules/FindLyXGettext.cmake
@@ -45,10 +45,10 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
       SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
 
       ADD_CUSTOM_COMMAND( 
-         OUTPUT ${_gmoFile} ${_absFile}.new
-         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet -o ${_absFile}.new -s ${_absFile} ${_absPotFile}
-         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}.new
-         DEPENDS ${_absPotFile} ${_absFile}
+         OUTPUT ${_gmoFile} 
+         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${_absFile} ${_absPotFile}
+         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+         DEPENDS ${_absPotFile} ${_absFile} 
       )
 
       INSTALL(FILES ${_gmoFile} DESTINATION ${LYX_ABS_INSTALLED_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) 

diff --git a/development/cmake/po/CMakeLists.txt b/development/cmake/po/CMakeLists.txt
index 61aa0be96984ee034a924da8a8de002491e40255..63110646b26c003fd2d433eeba88a5f4531f3b05 100755 (executable)
--- a/development/cmake/po/CMakeLists.txt
+++ b/development/cmake/po/CMakeLists.txt
@@ -120,8 +120,8 @@ endforeach(_pofile)
 foreach(_pofile ${LYX_BASE_PO_FILES})
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied
-    COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${_pofile} ${_lyxname}.pot -o ${_pofile}.copied
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied ${LYX_DEST_PO}/${_pofile}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile}
+    COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
     )
   list(APPEND LYX_UPDATED_PO_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied)