From f2b26e93e952dfd22250409f91e63b2b6d77aa61 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 30 Apr 2015 15:28:28 +0200 Subject: [PATCH] Fix crash with wrong handling of languages when building with CMake. --- CMakeLists.txt | 3 ++- po/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d08dedc4d..f4d818975 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,8 @@ set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINP set(LINPHONE_SO_VERSION "7") 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}") +string(REGEX REPLACE "([a-zA-Z_]+)\\.po" "\\1" LINPHONE_ALL_LANGS_LIST "${LINPHONE_PO_FILES}") +string(REPLACE ";" " " LINPHONE_ALL_LANGS "${LINPHONE_ALL_LANGS_LIST}") include(CMakeDependentOption) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 9b856b482..52f36bb40 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -21,7 +21,7 @@ ############################################################################ if(GETTEXT_FOUND) - foreach(language ${LINPHONE_ALL_LANGS}) + foreach(language ${LINPHONE_ALL_LANGS_LIST}) 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