diff options
| author | <philippe colliot> | 2015-06-05 18:09:28 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-06-05 18:09:28 +0200 |
| commit | b013de40963dc485d609e8f30f6b794aa141e90c (patch) | |
| tree | 8319cdee92dba34f7ea27988b9cba3602933dd6a /src/navigation/map-viewer | |
| parent | 768dde412c01f86c78f50b45432f652415cad356 (diff) | |
| download | poi-service-b013de40963dc485d609e8f30f6b794aa141e90c.tar.gz | |
relocate lib under .libs, still runtime bug to solve
Diffstat (limited to 'src/navigation/map-viewer')
5 files changed, 7 insertions, 7 deletions
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt index fc07c25..650a4d9 100644 --- a/src/navigation/map-viewer/CMakeLists.txt +++ b/src/navigation/map-viewer/CMakeLists.txt @@ -43,7 +43,7 @@ find_program(XSLTPROC xsltproc REQUIRED) # Generate the config file for navit/mapviewer execute_process( - OUTPUT_FILE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/navit_genivi_mapviewer.xml + 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 ) diff --git a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt index c373adb..fc09163 100644 --- a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt +++ b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt @@ -35,5 +35,5 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/map-viewer) set(genivi_mapviewer_configuration_LIBS ${PLUGIN_LDFLAGS}) set(genivi_mapviewer_configuration_LIBRARY_DIRS ${PLUGIN_LIBRARIES}) -add_library_plugin(genivi_mapviewer_configuration genivi_mapviewer_configuration.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-configuration_adaptor.h) +module_add_library(genivi_mapviewer_configuration genivi_mapviewer_configuration.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-configuration_adaptor.h) diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt index bcb7d35..319c741 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt @@ -36,5 +36,5 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core) set(genivi_mapviewer_mapviewercontrol_LIBS ${PLUGIN_LDFLAGS}) set(genivi_mapviewer_mapviewercontrol_LIBRARY_DIRS ${PLUGIN_LIBRARIES}) -add_library_plugin(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) +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) diff --git a/src/navigation/map-viewer/navit_genivi_mapviewer.xsl b/src/navigation/map-viewer/navit_genivi_mapviewer.xsl index a1e7c60..9616740 100644 --- a/src/navigation/map-viewer/navit_genivi_mapviewer.xsl +++ b/src/navigation/map-viewer/navit_genivi_mapviewer.xsl @@ -23,11 +23,11 @@ <xsl:template match="/config/plugins/plugin[1]" priority="1" > <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy> <xsl:text>
 </xsl:text> - <plugin path="../lib/libgenivi_mapviewer_configuration.so" ondemand="no"/> + <plugin path="../../../map-viewer/mapviewer-configuration/.libs/libgenivi_mapviewer_configuration.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="../lib/libgenivi_mapviewer_session.so" ondemand="no"/> + <plugin path="../../../map-viewer/mapviewer-session/.libs/libgenivi_mapviewer_session.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="../lib/libgenivi_mapviewer_mapviewercontrol.so" ondemand="no"/> + <plugin path="../../../map-viewer/mapviewer-mapviewercontrol/.libs/libgenivi_mapviewer_mapviewercontrol.so" ondemand="no"/> </xsl:template> <xsl:template match="/config/plugins/plugin"> <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy> diff --git a/src/navigation/map-viewer/session-plugin/CMakeLists.txt b/src/navigation/map-viewer/session-plugin/CMakeLists.txt index 86caca5..dd1a7de 100644 --- a/src/navigation/map-viewer/session-plugin/CMakeLists.txt +++ b/src/navigation/map-viewer/session-plugin/CMakeLists.txt @@ -35,5 +35,5 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/map-viewer) set(genivi_mapviewer_session_LIBS ${PLUGIN_LDFLAGS}) set(genivi_mapviewer_session_LIBRARY_DIRS ${PLUGIN_LIBRARIES}) -add_library_plugin(genivi_mapviewer_session genivi_mapviewer_session.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-session_adaptor.h) +module_add_library(genivi_mapviewer_session genivi_mapviewer_session.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-session_adaptor.h) |