diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-04 19:53:55 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-04 19:53:55 +0000 |
| commit | ac15afca63a5a9b222c34c1769f581838538cef0 (patch) | |
| tree | 7a210aea85fd109247235c0e3b9e3171d75eadd5 | |
| parent | b5115f239bbabaa572b75b90ff59eba42513b6c4 (diff) | |
| download | navit-svn-ac15afca63a5a9b222c34c1769f581838538cef0.tar.gz | |
Add:Build:Improved gettext handling
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5475 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rwxr-xr-x | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cmake/FindXGettextGlade.cmake | 10 | ||||
| -rw-r--r-- | cmake/navit_xml_parser_glade.cmake | 6 |
3 files changed, 17 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 043b7b27..3fb54e71 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ find_package(SDL_image) find_package(OpenGL) find_package(GLUT) find_package(GTK2 2.6 COMPONENTS gtk) -find_package(Gettext) +find_package(XGettextGlade) find_package(PNG) find_package(DBusGLib) find_package(OpenSSL) @@ -342,15 +342,6 @@ if (HAVE_CREATEPROCESS) set_with_reason(speech/cmdline "CreateProcess() call is available" TRUE) endif(HAVE_CREATEPROCESS) -if (GETTEXT_FOUND) - execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) - if ("${GETTEXT_RET}" STREQUAL "0") - set(XGETTEXT_GLADE TRUE) - else() - set(XGETTEXT_GLADE FALSE) - endif() -endif(GETTEXT_FOUND) - if (LIBLOCATION_FOUND) set_with_reason(vehicle/maemo "Maemo location library found" TRUE ${LIBLOCATION_LIBRARIES}) endif(LIBLOCATION_FOUND) diff --git a/cmake/FindXGettextGlade.cmake b/cmake/FindXGettextGlade.cmake new file mode 100644 index 00000000..4aa9184c --- /dev/null +++ b/cmake/FindXGettextGlade.cmake @@ -0,0 +1,10 @@ +find_package(Gettext) +FIND_PROGRAM(XGETTEXT xgettext) +if (XGETTEXT_FOUND) + execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) + if ("${GETTEXT_RET}" STREQUAL "0") + set(XGETTEXT_GLADE TRUE) + else() + set(XGETTEXT_GLADE FALSE) + endif() +endif(XGETTEXT_FOUND) diff --git a/cmake/navit_xml_parser_glade.cmake b/cmake/navit_xml_parser_glade.cmake index dc9616f7..350d8e07 100644 --- a/cmake/navit_xml_parser_glade.cmake +++ b/cmake/navit_xml_parser_glade.cmake @@ -1,6 +1,12 @@ file(READ "${SRC}" OUTPUT_LINES) +if (PREFIX) + set(OUTPUT_LINES "<html>" "${OUTPUT_LINES}") +endif() 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}") +if (SUFFIX) + set(OUTPUT_LINES "${OUTPUT_LINES}" "</html>") +endif() file(WRITE ${DST} ${OUTPUT_LINES}) |