r7939 - in /branches/1.5-stable: licq/po/CMakeLists.txt osd/po/CMakeLists.txt

Author: erijo
Date: Thu Oct 21 01:40:32 2010
New Revision: 7939

Log:
Merged r7922 and r7928 from trunk to not update the po files unless translations_update is built

Modified:
    branches/1.5-stable/licq/po/CMakeLists.txt
    branches/1.5-stable/osd/po/CMakeLists.txt

Modified: branches/1.5-stable/licq/po/CMakeLists.txt
==============================================================================
--- branches/1.5-stable/licq/po/CMakeLists.txt (original)
+++ branches/1.5-stable/licq/po/CMakeLists.txt Thu Oct 21 01:40:32 2010
@@ -10,15 +10,46 @@
   message(FATAL_ERROR "Gettext message catalog tools NOT found")
 endif (NOT GETTEXT_MSGMERGE_EXECUTABLE AND NOT GETTEXT_MSGFMT_EXECUTABLE)
 
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+if (GETTEXT_XGETTEXT_EXECUTABLE)
+  # Get list of all source files
+  file(GLOB_RECURSE po_source
+    RELATIVE ${PROJECT_SOURCE_DIR}
+    ${PROJECT_SOURCE_DIR}/src/*.c
+    ${PROJECT_SOURCE_DIR}/src/*.cpp
+  )
+
+  add_custom_target(translations_update
+    ${GETTEXT_XGETTEXT_EXECUTABLE}
+      --directory ${PROJECT_SOURCE_DIR}
+      --output="${CMAKE_CURRENT_SOURCE_DIR}/licq.pot"
+      --default-domain=licq
+      --add-comments=TRANSLATORS:
+      --keyword=tr
+      --keyword=tr_NOOP
+      --copyright-holder='Licq Developers'
+      --msgid-bugs-address="[email protected]"
+      --sort-output
+      ${po_source}
+    COMMENT "Updating licq.pot"
+  )
+endif (GETTEXT_XGETTEXT_EXECUTABLE)
+
 foreach(lang ${po_FILES})
   set(po  "${CMAKE_CURRENT_SOURCE_DIR}/${lang}.po")
   set(gmo "${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo")
 
-  add_custom_command(OUTPUT ${gmo}
+  # Update po files after pot file
+  add_custom_command(TARGET translations_update POST_BUILD
     COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none
       --sort-output ${po} ${CMAKE_CURRENT_SOURCE_DIR}/licq.pot
+    COMMENT "Updating ${lang}.po"
+  )
+
+  # Add command to build X.gmo from X.po
+  add_custom_command(OUTPUT ${gmo}
     COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${gmo} ${po}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/licq.pot ${po}
+    DEPENDS ${po}
   )
 
   install(FILES ${gmo}
@@ -30,30 +61,3 @@
 endforeach(lang)
 
 add_custom_target(translations ALL DEPENDS ${gmoFiles})
-
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-if (GETTEXT_XGETTEXT_EXECUTABLE)
-  # Get list of all source files
-  file(GLOB_RECURSE po_source
-    RELATIVE ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/src/*.c
-    ${PROJECT_SOURCE_DIR}/src/*.cpp
-  )
-
-  add_custom_command(
-    OUTPUT licq.pot
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
-      --directory ${PROJECT_SOURCE_DIR}
-      --output="${CMAKE_CURRENT_SOURCE_DIR}/licq.pot"
-      --default-domain=licq
-      --add-comments=TRANSLATORS:
-      --keyword=tr
-      --keyword=tr_NOOP
-      --copyright-holder='Licq Developers'
-      --msgid-bugs-address="[email protected]"
-      --sort-output
-      ${po_source}
-  )
-
-  add_custom_target(translations_update DEPENDS licq.pot)
-endif (GETTEXT_XGETTEXT_EXECUTABLE)

Modified: branches/1.5-stable/osd/po/CMakeLists.txt
==============================================================================
--- branches/1.5-stable/osd/po/CMakeLists.txt (original)
+++ branches/1.5-stable/osd/po/CMakeLists.txt Thu Oct 21 01:40:32 2010
@@ -14,15 +14,50 @@
 
 find_package(Gettext REQUIRED)
 
+if (NOT GETTEXT_MSGMERGE_EXECUTABLE AND NOT GETTEXT_MSGFMT_EXECUTABLE)
+  message(FATAL_ERROR "Gettext message catalog tools NOT found")
+endif (NOT GETTEXT_MSGMERGE_EXECUTABLE AND NOT GETTEXT_MSGFMT_EXECUTABLE)
+
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+if (GETTEXT_XGETTEXT_EXECUTABLE)
+  # Get list of all source files
+  file(GLOB_RECURSE po_source
+    RELATIVE ${PROJECT_SOURCE_DIR}
+    ${PROJECT_SOURCE_DIR}/src/*.h
+    ${PROJECT_SOURCE_DIR}/src/*.cpp
+  )
+
+  add_custom_target(${licq_target_prefix}translations_update
+    ${GETTEXT_XGETTEXT_EXECUTABLE}
+      --directory ${PROJECT_SOURCE_DIR}
+      --output="${CMAKE_CURRENT_SOURCE_DIR}/licq_osd_plugin.pot"
+      --default-domain=licq_osd_plugin
+      --add-comments=TRANSLATORS:
+      --keyword=_
+      --keyword=N_
+      --copyright-holder='Licq Developers'
+      --msgid-bugs-address="[email protected]"
+      --sort-output
+      ${po_source}
+    COMMENT "Updating licq_osd_plugin.pot"
+  )
+endif (GETTEXT_XGETTEXT_EXECUTABLE)
+
 foreach(lang ${po_FILES})
   set(po  "${CMAKE_CURRENT_SOURCE_DIR}/${lang}.po")
   set(gmo "${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo")
 
-  add_custom_command(OUTPUT ${gmo}
+  # Update po files after pot file
+  add_custom_command(TARGET ${licq_target_prefix}translations_update POST_BUILD
     COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none
       --sort-output ${po} ${CMAKE_CURRENT_SOURCE_DIR}/licq_osd_plugin.pot
+    COMMENT "Updating ${lang}.po"
+  )
+
+  # Add command to build X.gmo from X.po
+  add_custom_command(OUTPUT ${gmo}
     COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${gmo} ${po}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/licq_osd_plugin.pot ${po}
+    DEPENDS ${po}
   )
 
   install(FILES ${gmo}
@@ -34,31 +69,3 @@
 endforeach(lang)
 
 add_custom_target(${licq_target_prefix}translations ALL DEPENDS ${gmoFiles})
-
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-if (GETTEXT_XGETTEXT_EXECUTABLE)
-  # Get list of all source files
-  file(GLOB_RECURSE po_source
-    RELATIVE ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/src/*.h
-    ${PROJECT_SOURCE_DIR}/src/*.cpp
-  )
-
-  add_custom_command(
-    OUTPUT licq_osd_plugin.pot
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
-      --directory ${PROJECT_SOURCE_DIR}
-      --output="${CMAKE_CURRENT_SOURCE_DIR}/licq_osd_plugin.pot"
-      --default-domain=licq_osd_plugin
-      --add-comments=TRANSLATORS:
-      --keyword=_
-      --keyword=N_
-      --copyright-holder='Licq Developers'
-      --msgid-bugs-address="[email protected]"
-      --sort-output
-      ${po_source}
-  )
-
-  add_custom_target(${licq_target_prefix}translations_update
-    DEPENDS licq_osd_plugin.pot)
-endif (GETTEXT_XGETTEXT_EXECUTABLE)