diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-12 21:06:24 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-12 21:06:24 +0000 |
| commit | 90f9542cbcee8e99d3be7f11ce594ae65b6cb16d (patch) | |
| tree | 77eb185f353ef9d554629d9245f79d2f52870211 | |
| parent | Updated icelandic translation is.po (diff) | |
| download | inkscape-90f9542cbcee8e99d3be7f11ce594ae65b6cb16d.tar.gz inkscape-90f9542cbcee8e99d3be7f11ce594ae65b6cb16d.zip | |
Fix install location of .mo files
.mo files were copied to e.g. "en.mo" instead of "inkscape.mo"
This was broken after e939fcccf36f2a89435b0f8328db9be32ce3b600
as there was one tiny customization in our copy of FindGettext.cmake
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | po/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index e10625294..dd45ccf1c 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -8,7 +8,7 @@ if(WIN32) set(INKSCAPE_DATADIR "") # can be set via the environment variable INKSCAPE_DATADIR at runtime - set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") + set(PACKAGE_LOCALE_DIR "share/locale") set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}") # share/inkscape goes directly into /share on Windows diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 801612c6b..a8230fea7 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -340,7 +340,7 @@ if(WITH_NLS) if(INTLTOOL-UPDATE) message(STATUS "Found íntltool. inkscape.pot will be re-created if missing.") else() - message(STATUS "Did not find íntltool. inkscape.pot can't be re-created.") + message(STATUS "Did not find intltool. inkscape.pot can't be re-created.") endif() endif(WITH_NLS) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 5abdc91bf..e24407634 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -4,7 +4,9 @@ foreach(language ${LANGUAGES}) string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language}) string(REGEX REPLACE "\\.po$" "" language ${language}) set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) - GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION "share/locale/" PO_FILES ${pofile}) + set(gmofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.gmo) + GETTEXT_PROCESS_PO_FILES(${language} ALL PO_FILES ${pofile}) + install(FILES ${gmofile} DESTINATION "${PACKAGE_LOCALE_DIR}/${language}/LC_MESSAGES/" RENAME ${CMAKE_PROJECT_NAME}.mo) endforeach(language) |