diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-02-14 10:07:42 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-02-14 10:07:42 +0100 |
| commit | 352794373423dcbd343fc032d7983eeff6733ff7 (patch) | |
| tree | 855f2d08ee7a5598e4adffdcdb3f1a7c125e5b56 | |
| parent | f1c45529460d5bea078d748352cc7925d23695cf (diff) | |
| download | poi-service-352794373423dcbd343fc032d7983eeff6733ff7.tar.gz | |
update build for the V5 version of positioning
2 files changed, 7 insertions, 4 deletions
diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt b/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt index 3d4e7fe..4f00710 100644 --- a/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt +++ b/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt @@ -29,12 +29,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) # Path to the generated files -set(PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH "${COMMONAPI_GEN_DIR_POSITIONING}/org/genivi/EnhancedPositionService") #files shared by the enhanced position service APIs +set(PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH_SRC "${COMMONAPI_GEN_DIR_POSITIONING}/v5/org/genivi/EnhancedPositionService") #files shared by the enhanced position service APIs +set(PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH_INC "${COMMONAPI_GEN_DIR_POSITIONING}/org/genivi/EnhancedPositionService") # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cxx) FILE(GLOB PRJ_PROXY_GEN_SRCS - ${PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH}/EnhancedPositionDBusProxy.cpp + ${PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH_SRC}/EnhancedPositionDBusProxy.cpp ) set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_PROXY_GEN_SRCS}) @@ -42,7 +43,8 @@ set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_PROXY_GEN_SRCS}) include_directories( ${COMMONAPI_GEN_DIR} ${COMMONAPI_GEN_DIR_POSITIONING} - ${PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH} + ${PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH_INC} + ${PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH_SRC} ${DBUS_INCLUDE_DIRS} ${COMMONAPI_INCLUDE_DIRS} ${COMMONAPI_DBUS_INCLUDE_DIRS} diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx index b065e1b..2934800 100644 --- a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx @@ -46,7 +46,7 @@ #include <unistd.h> #include <CommonAPI/CommonAPI.hpp> -#include <EnhancedPositionProxy.hpp> +#include <v5/org/genivi/EnhancedPositionService/EnhancedPositionProxy.hpp> #include <EnhancedPositionServiceTypes.hpp> #if (!DEBUG_ENABLED) @@ -55,6 +55,7 @@ #endif using namespace org::genivi::EnhancedPositionService; +using namespace v5::org::genivi::EnhancedPositionService; static std::shared_ptr < CommonAPI::Runtime > runtime; |