From 4142eeb4ce3128c736aebbddb5e5076779e589b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 21 Apr 2015 14:56:05 +0200 Subject: [PATCH] Fix CMake issues about the generation of the list of languages --- CMakeLists.txt | 5 ++--- po/CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94ef76c9a..66316a163 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,8 @@ set(LINPHONE_MICRO_VERSION "1") set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}") set(LINPHONE_SO_VERSION "6") -file(GLOB LINPHONE_PO_FILES RELATIVE "po" "po/*.po") -string(REPLACE ".po" "" LINPHONE_ALL_LANGS "${LINPHONE_PO_FILES}") - +file(GLOB LINPHONE_PO_FILES RELATIVE "${CMAKE_SOURCE_DIR}/po" "${CMAKE_SOURCE_DIR}/po/*.po") +string(REGEX REPLACE "([a-zA-Z_]+)\\.po" "\\1" LINPHONE_ALL_LANGS "${LINPHONE_PO_FILES}") include(CMakeDependentOption) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 7c39caac6..9b856b482 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -21,8 +21,7 @@ ############################################################################ if(GETTEXT_FOUND) - string(REPLACE " " ";" LANGUAGES ${LINPHONE_ALL_LANGS}) - foreach(language ${LANGUAGES}) + foreach(language ${LINPHONE_ALL_LANGS}) GETTEXT_PROCESS_PO_FILES(${language} ALL PO_FILES ${language}.po) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.gmo DESTINATION ${PACKAGE_LOCALE_DIR}/${language}/LC_MESSAGES