summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-12-03 20:18:49 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-12-03 20:18:49 +0000
commit1e88c93249cf3cdec7fd657890e4279511588cb8 (patch)
treea9d64d7a5e34db42b32f3936d38779403ccb580c
parentc0f091174becbd131622941c7e70fa8da46a2448 (diff)
downloadnavit-svn-1e88c93249cf3cdec7fd657890e4279511588cb8.tar.gz
Fix:Build:Don't use sed for setting package string in po files
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3750 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--CMakeLists.txt1
-rw-r--r--cmake/navit_po_version.cmake3
-rw-r--r--po/CMakeLists.txt4
3 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b20303da..1a89292d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ cmake_policy(VERSION 2.6)
set(PACKAGE_VERSION "0.5.0")
set(PACKAGE_NAME "navit-svn")
set(PACKAGE "navit")
+set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
include("${PROJECT_SOURCE_DIR}/cmake/navit_macros.cmake")
diff --git a/cmake/navit_po_version.cmake b/cmake/navit_po_version.cmake
new file mode 100644
index 00000000..ff5e7d8e
--- /dev/null
+++ b/cmake/navit_po_version.cmake
@@ -0,0 +1,3 @@
+file(READ "${SRC}" OUTPUT_LINES)
+string(REGEX REPLACE "\"Project-Id-Version: [^\"]*\"" "\"Project-Id-Version: ${PACKAGE_STRING}\\\\n\"" OUTPUT_LINES "${OUTPUT_LINES}")
+file(WRITE "${DST}" "${OUTPUT_LINES}")
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 2f9218ea..90abaeee 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -44,7 +44,9 @@ foreach (LANG ${LANGUAGES})
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/navit.po
- COMMAND sed 's/^\"Project-Id-Version:.*/\"Project-Id-Version: ${PACKAGE_STRING}\\\\n\"/' < "${CMAKE_CURRENT_SOURCE_DIR}/${LANG}.po.in" | ${GETTEXT_MSGMERGE_EXECUTABLE} --no-fuzzy-matching --verbose -o "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po" - ${CMAKE_CURRENT_BINARY_DIR}/navit.po
+ COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/${LANG}.po.in -D DST=${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po.tmp -DPACKAGE_STRING=${PACKAGE_STRING} -P ${PROJECT_SOURCE_DIR}/cmake/navit_po_version.cmake
+ COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --no-fuzzy-matching --verbose -o "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po" "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po.tmp" ${CMAKE_CURRENT_BINARY_DIR}/navit.po
+ COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.po.tmp"
)
endforeach(LANG ${LANGUAGES})