[geary/wip/l10n-713827: 5/7] CMake tweaks to handle new gen-potfile

[Charles Lindsay <clindsay src gnome org>]

commit 5edfe8b5bdfffc90b6cb88a35db765bd8262885f
Author: Charles Lindsay <chaz yorba org>
Date:   Thu Jan 9 16:33:34 2014 -0800

    CMake tweaks to handle new gen-potfile

 CMakeLists.txt      |    4 ---
 cmake/Gettext.cmake |   58 +-------------------------------------------------
 src/CMakeLists.txt  |    7 ------
 ui/CMakeLists.txt   |    4 ---
 4 files changed, 2 insertions(+), 71 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b4f4e1..12983b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,6 @@ set(ARCHIVE_BASE_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 set(ARCHIVE_FULL_NAME ${ARCHIVE_BASE_NAME}.tar.xz)
 set(ARCHIVE_DEBUILD_FULL_NAME ${CMAKE_PROJECT_NAME}_${VERSION}.orig.tar.xz)
 
-set(GLADE_FILES ui/account_list.glade ui/account_cannot_remove.glade ui/account_spinner.glade
-    ui/composer.glade ui/login.glade ui/message.glade ui/password-dialog.glade ui/preferences.glade
-    ui/remove_confirm.glade)
-
 option(DEBUG "Build for debugging." OFF)
 option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
 option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
diff --git a/cmake/Gettext.cmake b/cmake/Gettext.cmake
index 9be4742..962cc4c 100644
--- a/cmake/Gettext.cmake
+++ b/cmake/Gettext.cmake
@@ -76,61 +76,6 @@ IF(NOT DEFINED XGETTEXT_OPTIONS)
 ENDIF(NOT DEFINED XGETTEXT_OPTIONS)
 
 IF(XGETTEXT_FOUND)
-    MACRO(GETTEXT_CREATE_POT _potFile _pot_options )
-       SET(_xgettext_options_list)
-       SET(_src_list)
-       SET(_src_list_abs)
-       SET(_glade_list)
-       SET(_glade_list_abs)
-       SET(_stage "SRC")
-       FOREACH(_pot_option ${_pot_options} ${ARGN})
-               IF(_pot_option STREQUAL "OPTION")
-                       SET(_stage "OPTION")
-               ELSEIF(_pot_option STREQUAL "SRC")
-                       SET(_stage "SRC")
-               ELSEIF(_pot_option STREQUAL "GLADE")
-                       SET(_stage "GLADE")
-               ELSE(_pot_option STREQUAL "OPTION")
-                       IF(_stage STREQUAL "OPTION")
-                               SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
-                       ELSEIF(_stage STREQUAL "GLADE")
-                               FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} 
${CMAKE_SOURCE_DIR}/${_pot_option})
-                               GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
-                               SET(_glade_list ${_glade_list} ${_relFile})
-                               SET(_glade_list_abs ${_glade_list_abs} ${_absFile})
-                       ELSEIF(_stage STREQUAL "SRC")
-                               FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} 
${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
-                               GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
-                               SET(_src_list ${_src_list} ${_relFile})
-                               SET(_src_list_abs ${_src_list_abs} ${_absFile})
-                       ENDIF(_stage STREQUAL "OPTION")
-               ENDIF(_pot_option STREQUAL "OPTION")
-       ENDFOREACH(_pot_option ${_pot_options} ${ARGN})
-
-       IF (_xgettext_options_list)
-           SET(_xgettext_options ${_xgettext_options_list})
-       ELSE(_xgettext_options_list)
-           SET(_xgettext_options ${XGETTEXT_OPTIONS})
-       ENDIF(_xgettext_options_list)
-
-       #MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}")
-       ADD_CUSTOM_COMMAND(OUTPUT pot_file
-           COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list}
-           DEPENDS ${_src_list_abs} ${GLADE_FILES}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-           )
-
-       ADD_CUSTOM_TARGET(pot_file
-           COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o _source.pot ${_src_list}
-           COMMAND ${XGETTEXT_EXECUTABLE} --language=Glade --omit-header -o _glade.pot ${_glade_list}
-           COMMAND ${GETTEXT_MSGCAT_EXECUTABLE} -o ${_potFile} --use-first _source.pot _glade.pot
-           DEPENDS ${_src_list_abs}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-           COMMENT "Extract translatable messages to ${_potFile}"
-           )
-    ENDMACRO(GETTEXT_CREATE_POT _potFile _pot_options)
-
-
     MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang)
        SET(_gmoFiles)
        GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
@@ -156,9 +101,10 @@ IF(XGETTEXT_FOUND)
                #MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} 
curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
                ADD_CUSTOM_COMMAND(
                    OUTPUT ${_gmoFile}
+                    COMMAND [ ! -e ${_absPotFile} ] && ${CMAKE_CURRENT_SOURCE_DIR}/../po/gen-potfile || true
                    COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} 
${_absPotFile}
                    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
-                   DEPENDS ${_absPotFile} ${_absFile}
+                   DEPENDS ${_absFile}
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                    )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6115f71..4c3a45a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -650,13 +650,6 @@ add_custom_command(
 include(GSettings)
 add_schemas(geary ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
 
-IF (XGETTEXT_FOUND)
-    MESSAGE("Creating POT file")
-    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} 
GLADE ${GLADE_FILES})
-ELSE ()
-    message(STATUS "xgettext not found")
-ENDIF()
-
 # Console app
 #################################################
 vala_precompile(CONSOLE_VALA_C geary-console
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index a6d5767..b04dbe2 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -16,7 +16,3 @@ install(FILES remove_confirm.glade DESTINATION ${UI_DEST})
 install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_menu.ui DESTINATION ${UI_DEST})
 install(FILES upgrade_dialog.glade DESTINATION ${UI_DEST})
-
-#
-# NOTE: Update GLADE_FILES in ../CMakeLists.txt with additions and removals
-#