diff options
| author | <philippe colliot> | 2015-08-04 17:54:50 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-08-04 17:54:50 +0200 |
| commit | f0d502c1548dc8cc0805a0a72f74e46d821c0a9e (patch) | |
| tree | d395a1e6c079a18e871fc97c85ac5e53efe4b7c5 /src/navigation/map-viewer/CMakeLists.txt | |
| parent | 86c047d1c415e506069e222f621e8c13735f9c20 (diff) | |
| download | poi-service-f0d502c1548dc8cc0805a0a72f74e46d821c0a9e.tar.gz | |
Fix an issue with the former POC of POI search
Diffstat (limited to 'src/navigation/map-viewer/CMakeLists.txt')
| -rw-r--r-- | src/navigation/map-viewer/CMakeLists.txt | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt index bd8bdc7..b6e2f67 100644 --- a/src/navigation/map-viewer/CMakeLists.txt +++ b/src/navigation/map-viewer/CMakeLists.txt @@ -42,10 +42,17 @@ include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is find_program(XSLTPROC xsltproc REQUIRED) # Generate the config file for navit/mapviewer -execute_process( - OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_mapviewer.xml - COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml - ) +if(NOT ${YOCTO_CONFIG}) + execute_process( + OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_mapviewer.xml + COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml + ) +else() + execute_process( + OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/navit_genivi_mapviewer.xml + COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${NAVIT_CMAKE_DIR}/../navit/navit_shipped.xml + ) +endif() add_definitions(-DPLUGIN=1) if(WITH_DEBUG) @@ -62,6 +69,10 @@ endif() set(PLUGIN_LDFLAGS ${DBUS_CPP_LDFLAGS} ${DBUS_CPP_GLIB_LDFLAGS} ${GLIB_LDFLAGS}) set(PLUGIN_LIBRARIES ${DBUS_CPP_LIBRARY_DIRS} ${GLIB_LIBRARY_DIRS} ${DBUS_CPP_GLIB_LIBRARY_DIRS}) +if(${YOCTO_CONFIG}) + include_directories(${STAGING_INCDIR}/navit) +endif() + add_subdirectory(configuration-plugin) add_subdirectory(mapviewercontrol-plugin) |