diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-12-01 23:18:09 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-12-01 23:18:09 +0000 |
| commit | f4cfda4c03a9fff921d39ddc0c9ccad3906cc3ec (patch) | |
| tree | 3b56ca68f68ed8613a3c1ef90b3e87a6127cd6f0 | |
| parent | baac5c1eb82623b69c07c9748504af216050aed6 (diff) | |
| download | navit-svn-f4cfda4c03a9fff921d39ddc0c9ccad3906cc3ec.tar.gz | |
Fix:Build:Fixed locale generation
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3745 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | cmake/navit_xml_parser_glade.cmake | 6 | ||||
| -rw-r--r-- | navit/intl_cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | po/CMakeLists.txt | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/cmake/navit_xml_parser_glade.cmake b/cmake/navit_xml_parser_glade.cmake new file mode 100644 index 00000000..dc9616f7 --- /dev/null +++ b/cmake/navit_xml_parser_glade.cmake @@ -0,0 +1,6 @@ +file(READ "${SRC}" OUTPUT_LINES) +string(REGEX REPLACE "vehicleprofile" "atkaction" OUTPUT_LINES "${OUTPUT_LINES}") +string(REGEX REPLACE "name=" "description=" OUTPUT_LINES "${OUTPUT_LINES}") +string(REGEX REPLACE "...CDATA" " " OUTPUT_LINES "${OUTPUT_LINES}") +string(REGEX REPLACE "\\]\\]" "" OUTPUT_LINES "${OUTPUT_LINES}") +file(WRITE ${DST} ${OUTPUT_LINES}) diff --git a/navit/intl_cmake/CMakeLists.txt b/navit/intl_cmake/CMakeLists.txt index b1660525..d1162a92 100644 --- a/navit/intl_cmake/CMakeLists.txt +++ b/navit/intl_cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions(-DLOCALEDIR="${LOCALE_DIR}/locale" -DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1) +add_definitions(-DLOCALEDIR="${LOCALE_DIR}/locale" -DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1 -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1) supportlib_add_library(intl_cmake bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c) ADD_CUSTOM_TARGET(libintl.h DEPENDS libgnuintl.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h) ADD_DEPENDENCIES(intl_cmake libintl.h) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index a5557d61..a0f66b32 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -11,6 +11,7 @@ set(POTFILES ${PROJECT_SOURCE_DIR}/navit/gui/gtk/gui_gtk_statusbar.c ${PROJECT_SOURCE_DIR}/navit/gui/internal/gui_internal.c ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.c + ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade ) ADD_CUSTOM_COMMAND( @@ -20,6 +21,12 @@ ADD_CUSTOM_COMMAND( -P ${PROJECT_SOURCE_DIR}/cmake/navit_xml_parser.cmake ) +ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade + DEPENDS ${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml + COMMAND ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml -D DST=${CMAKE_CURRENT_BINARY_DIR}/navit_shipped.glade + -P ${PROJECT_SOURCE_DIR}/cmake/navit_xml_parser_glade.cmake +) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/navit.po |