diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-24 10:19:31 +0200 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-24 16:52:59 +0200 |
| commit | 47381bde3b4d7a9ee9780786c9a993f2b63a488a (patch) | |
| tree | 368e0a2506655673ae41d39fefd5c08aa8bfaab3 /cmake | |
| parent | c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d (diff) | |
| download | minetest-47381bde3b4d7a9ee9780786c9a993f2b63a488a.tar.gz minetest-47381bde3b4d7a9ee9780786c9a993f2b63a488a.tar.bz2 minetest-47381bde3b4d7a9ee9780786c9a993f2b63a488a.zip | |
Bring po update out of cmake again
This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
don't support options like --package-name
The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.
The downside is of course that you need some sane POSIX shell to update
the po files.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGettextLib.cmake | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index 1c36f8c6e..a215f3f8d 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -16,21 +16,6 @@ FIND_PROGRAM(GETTEXT_MSGFMT PATHS "${CUSTOM_GETTEXT_PATH}/bin" DOC "path to msgfmt") -FIND_PROGRAM(GETTEXT_MSGMERGE - NAMES msgmerge - PATHS "${CUSTOM_GETTEXT_PATH}/bin" - DOC "path to msgmerge") - -FIND_PROGRAM(GETTEXT_MSGEN - NAMES msgen - PATHS "${CUSTOM_GETTEXT_PATH}/bin" - DOC "path to msgen") - -FIND_PROGRAM(GETTEXT_EXTRACT - NAMES xgettext - PATHS "${CUSTOM_GETTEXT_PATH}/bin" - DOC "path to xgettext") - # modern Linux, as well as Mac, seem to not need require special linking # they do not because gettext is part of glibc # TODO check the requirements on other BSDs and older Linux @@ -73,6 +58,7 @@ IF(GETTEXT_FOUND) SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES) SET(GETTEXT_MO_DEST_PATH locale/<locale>/LC_MESSAGES) FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*") + LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot) MACRO(SET_MO_PATHS _buildvar _destvar _locale) STRING(REPLACE "<locale>" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH}) STRING(REPLACE "<locale>" ${_locale} ${_destvar} ${GETTEXT_MO_DEST_PATH}) |