Ticket #1119: patch_svn5496_move_intl.diff

File patch_svn5496_move_intl.diff, 2.3 KB (added by ftom.myopenid.com, 7 years ago)

patch generated by svn diff, prepares move of intl_cmake

  • navit/intl_cmake/CMakeLists.txt

     
    11add_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}\")
    2 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)
     2supportlib_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)
    33ADD_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)
    4 ADD_DEPENDENCIES(intl_cmake libintl.h)
     4ADD_DEPENDENCIES(support_gettext_intl libintl.h)
  • navit/CMakeLists.txt

     
    155155
    156156ADD_DEPENDENCIES(${NAVIT_LIBNAME} version)
    157157if (USE_LIBGNUINTL AND NOT HAVE_GLIB)
    158    ADD_DEPENDENCIES(support_glib intl_cmake)
     158   ADD_DEPENDENCIES(support_glib support_gettext_intl)
    159159endif()
    160160
    161161
  • CMakeLists.txt

     
    173173### Configure build
    174174#Required libraries, supplied with navit
    175175if (NOT HAVE_LIBINTL)
    176    add_plugin(intl_cmake "native libintl missing" TRUE)
     176   add_plugin(support/gettext_intl "native libintl missing" TRUE)
    177177   set(USE_LIBGNUINTL TRUE)
    178178else()
    179179   CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)