Fix:Build:WIN32 NLS Build issues

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3777 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/config.h.cmake b/navit/config.h.cmake
index 03c917f..bfab4a9 100644 (file)
--- a/navit/config.h.cmake
+++ b/navit/config.h.cmake
@@ -15,6 +15,7 @@
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 #cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
 #cmakedefine PACKAGE "@PACKAGE@"
+#cmakedefine LOCALEDIR "@LOCALE_DIR@/locale"
 
 #cmakedefine HAVE_ZLIB 1
 

diff --git a/navit/navit/intl_cmake/CMakeLists.txt b/navit/navit/intl_cmake/CMakeLists.txt
index d1162a9..231de22 100644 (file)
--- a/navit/navit/intl_cmake/CMakeLists.txt
+++ b/navit/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 -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1)
+add_definitions(-DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1 -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)