[Navit-cvs-commit] SF.net SVN: navit:[5648] trunk/navit

[<sl...@us...>]

Revision: 5648
          http://sourceforge.net/p/navit/code/5648
Author:   sleske
Date:     2013-09-27 21:31:22 +0000 (Fri, 27 Sep 2013)
Log Message:
-----------
Refactor:build/cmake:Rename dir intl_cmake to support/gettext_intl for consistency.|Fixes #1119.

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt
    trunk/navit/navit/CMakeLists.txt
    trunk/navit/navit/support/gettext_intl/CMakeLists.txt

Added Paths:
-----------
    trunk/navit/navit/support/gettext_intl/

Removed Paths:
-------------
    trunk/navit/navit/intl_cmake/

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -174,7 +174,7 @@
 ### Configure build
 #Required libraries, supplied with navit
 if (NOT HAVE_LIBINTL)
-   add_plugin(intl_cmake "native libintl missing" TRUE)
+   add_plugin(support/gettext_intl "native libintl missing" TRUE)
    set(USE_LIBGNUINTL TRUE)
 else()
    CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)

Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/navit/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -152,7 +152,7 @@
 
 ADD_DEPENDENCIES(${NAVIT_LIBNAME} version)
 if (USE_LIBGNUINTL AND NOT HAVE_GLIB)
-   ADD_DEPENDENCIES(support_glib intl_cmake)
+   ADD_DEPENDENCIES(support_glib support_gettext_intl)
 endif()
 
 

Modified: trunk/navit/navit/support/gettext_intl/CMakeLists.txt
===================================================================
--- trunk/navit/navit/intl_cmake/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/navit/support/gettext_intl/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -1,4 +1,4 @@
 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 -DLIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\")
-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)
+supportlib_add_library(support_gettext_intl 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)
+ADD_DEPENDENCIES(support_gettext_intl libintl.h)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.