From 0a27f161f352689aabda4944e9dc54b11b5471ba Mon Sep 17 00:00:00 2001 From: mdankov Date: Sat, 3 Aug 2013 23:43:02 +0000 Subject: 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 --- CMakeLists.txt | 1 - navit/CMakeLists.txt | 1 - navit/support/glib/glibconfig.h | 2 +- 3 files changed, 1 insertion(+), 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 +#include #endif G_BEGIN_DECLS -- cgit v1.2.1