diff options
Diffstat (limited to 'src/navigation')
4 files changed, 8 insertions, 6 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index acab237..e84337d 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -159,7 +159,7 @@ endif() # Check if positioning stuff with the right version has been cloned and do it if necessary # positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR=<path to positioning src dir> set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git) -set(positioning_VERSION 98c626c1a3856f444e9441950f6500db6ae9b997) +set(positioning_VERSION fe164c14aa9594736656ff5c2ec0251a5f561376) if (EXISTS ${positioning_SRC_DIR}) execute_process(COMMAND ${git_get_src_version} diff --git a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt index 29a008b..ae9bd32 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt +++ b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt @@ -48,10 +48,13 @@ include_directories(${navit_SRC_DIR}/navit) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../..) -include_directories(${generated_api_DIR}) include_directories(${positioning_API}) set(genivi_positioning_enhancedposition_LIBS ${DBUS_CPP_LDFLAGS}) -module_add_library(genivi_positioning_enhancedposition genivi_positioning_enhancedposition.cxx ${generated_api_DIR}/genivi-positioning-enhancedposition_proxy.h) +module_add_library(genivi_positioning_enhancedposition + genivi_positioning_enhancedposition.cxx + ${positioning_API}/genivi-positioning-enhancedposition_proxy.h + ${positioning_API}/genivi-positioning-constants.h +) diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx index 1aa7f2e..29caa62 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -48,8 +48,6 @@ */ #include <dbus-c++/glib-integration.h> -#include "genivi-navigationcore-constants.h" -#include "genivi-positioning-constants.h" #include <glib.h> #include <string.h> #include <stdbool.h> @@ -73,6 +71,7 @@ #define dbg(level,...) ; #endif +#include "genivi-positioning-constants.h" #include "genivi-positioning-enhancedposition_proxy.h" DBus::Glib::BusDispatcher dispatcher; diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh index 70baca7..98492cf 100755 --- a/src/navigation/script/build.sh +++ b/src/navigation/script/build.sh @@ -299,7 +299,7 @@ build() { cd $NAVIGATION_CORE_BIN_DIR mkdir -p $NAVIGATION_CORE_ENHANCEDPOSITION cd $NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR - cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$ENHANCED_POSITION_SERVICE_GENERATED_API_DIR -Dapi_DIR=$API_DIR -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make + cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$ENHANCED_POSITION_SERVICE_GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make cd $TOP_BIN_DIR mkdir -p $MAP_VIEWER |