diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-03 23:43:02 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-03 23:43:02 +0000 |
| commit | 0a27f161f352689aabda4944e9dc54b11b5471ba (patch) | |
| tree | a720c25fd87f9343de25ce9bfceb300f75d654d6 | |
| parent | c0d0c82b40af5bfa70803cab1842a2c3033db2d4 (diff) | |
| download | navit-0a27f161f352689aabda4944e9dc54b11b5471ba.tar.gz | |
Fix:core:Let it be buildable for win* platforms with CMake.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5558 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rwxr-xr-x | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | navit/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | navit/support/glib/glibconfig.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1232661c4..569ffa81a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,6 @@ CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC) if (NOT HAVE_LIBINTL) add_plugin(intl_cmake "native libintl missing" TRUE) set(USE_LIBGNUINTL TRUE) - include_directories("${CMAKE_BINARY_DIR}/navit/intl_cmake") else() CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL) if (NEEDS_LIBINTL) diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 1da11fdb1..5bef49138 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -156,7 +156,6 @@ endif() ADD_DEPENDENCIES(${NAVIT_LIBNAME} version) if (USE_LIBGNUINTL AND NOT HAVE_GLIB) ADD_DEPENDENCIES(support_glib intl_cmake) - set_property(SOURCE ${PROJECT_SOURCE_DIR}/navit/support/glib/glibconfig.h APPEND PROPERTY OBJECT_DEPENDS "${PROJECT_BINARY_DIR}/navit/intl_cmake/libintl.h") endif() diff --git a/navit/support/glib/glibconfig.h b/navit/support/glib/glibconfig.h index f60c57160..6baa58873 100644 --- a/navit/support/glib/glibconfig.h +++ b/navit/support/glib/glibconfig.h @@ -14,7 +14,7 @@ #include "config.h" #ifdef HAVE_API_WIN32_BASE -#include <libintl.h> +#include <libgnuintl.h> #endif G_BEGIN_DECLS |