diff options
| author | <philippe colliot> | 2015-06-01 17:22:54 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-06-01 17:22:54 +0200 |
| commit | 67c03d54148e53ecdc2c8b1501d02e9bbb8612a8 (patch) | |
| tree | 7abfb5c99ddcec903b67668f76af92ecb0e6ac85 /src/navigation/map-viewer/mapviewercontrol-plugin | |
| parent | 01f8523cdb2a5407e15e2ac84008f2a8695fa4a3 (diff) | |
| download | poi-service-67c03d54148e53ecdc2c8b1501d02e9bbb8612a8.tar.gz | |
start migration of poi-service to fully based cmake build
Diffstat (limited to 'src/navigation/map-viewer/mapviewercontrol-plugin')
| -rw-r--r-- | src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt index 14e4b7f..4a11eff 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt @@ -37,7 +37,12 @@ pkg_search_module(GLIB glib-2.0) include_directories(${GLIB_INCLUDE_DIRS}) include_directories(${DBUS_CPP_INCLUDE_DIRS}) -include_directories(${NAVIT_SRC_DIR}/navit/navit) +include(${PRELOAD_CACHE_FOR_PLUGINS}) + +include_directories(${INCLUDE_DIRECTORIES}) +include_directories(.) +include_directories(${navit_SOURCE_DIR}/navit) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated @@ -46,10 +51,7 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core) set(genivi_mapviewer_mapviewercontrol_LIBS ${DBUS_CPP_LDFLAGS}) -#preload the cache with some navit settings that use the current module name -LOAD_CACHE(${PRELOAD_CACHE_FOR_PLUGINS}) - -include(${NAVIT_SRC_DIR}/navit/cmake/navit_macros.cmake) +include(${navit_SOURCE_DIR}/cmake/navit_macros.cmake) module_add_library(genivi_mapviewer_mapviewercontrol genivi_mapviewer_mapviewercontrol.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-mapviewercontrol_adaptor.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-routing_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-session_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-mapmatchedposition_proxy.h) |