diff options
| author | Michał Górny <mgorny@gentoo.org> | 2018-11-04 17:10:29 +0100 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2018-11-04 17:10:29 +0100 |
| commit | a93a963ca99a2c704325c2db121cd81476e350cd (patch) | |
| tree | 5d154cc3920159d6ae6cc5f6d62a1b752e62debd | |
| parent | b931485fea289a3eb2b919bf6317bba8650d2bf4 (diff) | |
| download | midori-git-a93a963ca99a2c704325c2db121cd81476e350cd.tar.gz | |
Fix handling LINGUAS with unsupported languages (#156)
Fix the LINGUAS parsing code to strip unsupported languages. Otherwise,
the build will fail when user's LINGUAS contains a value that is not
supported by midori (e.g. 'pl'). While at it, also make sure that
empty LINGUAS is handled distinctly from unset.
| -rw-r--r-- | po/CMakeLists.txt | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 9626d966..16c207e1 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -2,13 +2,27 @@ include(FindGettext) if (GETTEXT_FOUND) - set(LANGUAGES $ENV{LINGUAS}) - if (NOT LANGUAGES) - file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po") - string(REPLACE ".po" " " LANGUAGES ${POTFILES}) - endif () + file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po") + string(REPLACE ".po" ";" ALL_LANGUAGES ${POTFILES}) + + # if LINGUAS is set, we need to filter its values to languages + # actually supported + # NB: LINGUAS="" is distinct from unset, and means 'install no l10n' + if(DEFINED ENV{LINGUAS}) + set(LINGUAS $ENV{LINGUAS}) + string(REPLACE " " ";" LINGUAS "${LINGUAS}") + set(LANGUAGES) + foreach(LANG ${LINGUAS}) + list(FIND ALL_LANGUAGES ${LANG} LANG_IDX) + if(NOT LANG_IDX EQUAL -1) + list(APPEND LANGUAGES ${LANG}) + endif() + endforeach() + else() + set(LANGUAGES ${ALL_LANGUAGES}) + endif() + message(STATUS "gettext found: ${LANGUAGES}") - string(REPLACE " " ";" LANGUAGES ${LANGUAGES}) if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8") GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.pot" ALL ${POTFILES}) else() |