diff options
Diffstat (limited to 'src/poi-service/poi-manager-server')
-rw-r--r-- | src/poi-service/poi-manager-server/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/poi-service/poi-manager-server/poi-manager-server-stub.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 8f56712..20c30fc 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -58,11 +58,14 @@ add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR # Path to the generated files set(API_VERSION_NAVIGATION_MAJOR 4) set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}") -set(API_VERSION_POISERVICE_MAJOR 2) +set(API_VERSION_POISERVICE_MAJOR 3) set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}") +set(API_VERSION_POISERVICE_CAM_MAJOR 2) +set(API_VERSION_POISERVICE_CAM "v${API_VERSION_POISERVICE_CAM_MAJOR}") set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) #files shared by all the APIs set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs +set(PRJ_SRC_GEN_POISERVICE_CAM_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE_CAM}/org/genivi/navigation/poiservice) #files shared by the poiservice CAM APIs # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) @@ -71,11 +74,13 @@ FILE(GLOB PRJ_STUB_GEN_SRCS ${PRJ_SRC_GEN_COMMON_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*StubDefault.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*StubDefault.cpp + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusStub*.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*StubDefault.cpp ) FILE(GLOB PRJ_STUB_IMPL_SRCS ${PRJ_SRC_GEN_COMMON_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Stub*.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Stub*.cpp + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Stub*.cpp ) set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_COMMON_SRCS} ${PRJ_STUB_GEN_SRCS} ${PRJ_STUB_IMPL_SRCS}) @@ -86,6 +91,7 @@ include_directories( ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} + ${PRJ_SRC_GEN_POISERVICE_CAM_PATH} ${DBUS_INCLUDE_DIRS} ${COMMONAPI_INCLUDE_DIRS} ${COMMONAPI_DBUS_INCLUDE_DIRS} diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.h b/src/poi-service/poi-manager-server/poi-manager-server-stub.h index 62bee90..5497802 100644 --- a/src/poi-service/poi-manager-server/poi-manager-server-stub.h +++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.h @@ -42,6 +42,7 @@ using namespace std; using namespace v2::org::genivi::navigation::poiservice; +using namespace v3::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; |