Merge lp:~dobey/cmake-extras/intltool-fixes into lp:cmake-extras

[dobey]

Simplify the INSTALL_TRANSLATIONS command to avoid regenerating po files.

[James Henstridge (jamesh)]

If the message catalogue contains out of date translations, msgmerge will comment them out IIRC. Does anything similar happen with the gettext_process_po_files() function? Or are we just assuming that it doesn't matter because the files will naturally get updated as Launchpad merges translation updates? to trunk?

Other than that, I'm happy to see anything that reduces the work these cmake modules do.

review: Needs Information

[dobey (dobey)]

We don't auto-update the po files with msgmerge in upstream intltool's automake rules either. We leave it up to maintainers to decide when that should happen. We made that decision a very long time ago, and there has never been a need to re-introduce the automatic updating.

Any cmake integration for intltool should provide the same level of functionality as upstream (and ideally, this stuff will end up upstream, once I figure out how to deal with the file conflict issue).

[Pete Woods (pete-woods)]

Tried building a couple of the indicators, and all still seems good!

Also the changes look sane, too.

review: Approve

[Pete Woods (pete-woods)]

(glad someone who knows exactly what is supposed to be happening in this macro had time to look at it, as I just had to guess when writing it)

[James Henstridge (jamesh)]

Sounds good to me too then.

review: Approve

=== modified file 'src/FindIntltool.cmake'
--- src/FindIntltool.cmake	2015-09-17 13:34:38 +0000
+++ src/FindIntltool.cmake	2016-11-29 21:19:58 +0000
@@ -281,50 +281,43 @@
 
 function(INTLTOOL_INSTALL_TRANSLATIONS)
     set(_options ALL)
-    set(_oneValueArgs GETTEXT_PACKAGE POT_FILE)
+    set(_oneValueArgs GETTEXT_PACKAGE)
 
     cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
 
-    set(_POT_FILE "${PROJECT}.pot")
+    set(_GETTEXT_PACKAGE "${PROJECT}")
 
     if(_ARG_GETTEXT_PACKAGE)
-        set(_POT_FILE "${_ARG_GETTEXT_PACKAGE}.pot")
-    endif()
-
-    if(_ARG_OUTPUT_FILE)
-        set(_POT_FILE "${_ARG_OUTPUT_FILE}")
+      set(_GETTEXT_PACKAGE "${_ARG_GETTEXT_PACKAGE}")
     endif()
 
     file(
         GLOB _PO_FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/*.po
+        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po
     )
 
-    get_filename_component(_ABS_POT_FILE ${_POT_FILE} ABSOLUTE)
-
     foreach(_PO_FILE ${_PO_FILES})
-        add_custom_command(
-           OUTPUT
-             ${_PO_FILE}
-           COMMAND
-             ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_PO_FILE} ${_ABS_POT_FILE}
-           DEPENDS
-             ${_ABS_POT_FILE}
+        string(REPLACE ".po" "" _LANG ${_PO_FILE})
+        if(_ARG_ALL)
+          gettext_process_po_files(
+            ${_LANG}
+            ALL
+            PO_FILES ${_PO_FILE}
+          )
+        else()
+          gettext_process_po_files(
+            ${_LANG}
+            PO_FILES ${_PO_FILE}
+          )
+        endif()
+        # Must define install ourselves as process_po_files doesn't know
+        # the gettext package, so installs en as en/LC_MESSAGES/en.mo
+        install(
+          FILES ${CMAKE_CURRENT_BINARY_DIR}/${_LANG}.gmo
+          DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_LANG}/LC_MESSAGES/
+          RENAME ${_GETTEXT_PACKAGE}.mo
         )
     endforeach()
-
-    if(_ARG_ALL)
-        gettext_create_translations(
-          ${_ABS_POT_FILE}
-          ALL
-          ${_PO_FILES}
-        )
-    else()
-        gettext_create_translations(
-          ${_ABS_POT_FILE}
-          ${_PO_FILES}
-        )
-    endif()
 endfunction()
 
 function(INTLTOOL_MERGE_TRANSLATIONS FILENAME OUTPUT_FILE)