diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-02-14 17:59:57 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-02-14 17:59:57 +0100 |
| commit | 3e023867588ef29d9808c27f37d3e6e0bcfeccb4 (patch) | |
| tree | 2f4cf90e4d1333a2694adb7134520ec2ad2cbe7a /test | |
| parent | da988d41a7e3cf4161677393b3514e173bce9639 (diff) | |
| download | poi-service-3e023867588ef29d9808c27f37d3e6e0bcfeccb4.tar.gz | |
fix API version to V2.0 in the POIService POCs
Diffstat (limited to 'test')
| -rw-r--r-- | test/poi-service/poi-manager-client/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | test/poi-service/poi-manager-client/main.cpp | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt index c06f869..101bfb6 100644 --- a/test/poi-service/poi-manager-client/CMakeLists.txt +++ b/test/poi-service/poi-manager-client/CMakeLists.txt @@ -60,16 +60,18 @@ set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR}/franca") # Path to the generated files -set(API_VERSION_MAJOR 4) -set(API_VERSION "v${API_VERSION_MAJOR}") -set(PRJ_SRC_GEN_ROOT_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi) #files shared by all the APIs -set(PRJ_SRC_GEN_NAVIGATION_PATH ${PRJ_SRC_GEN_ROOT_PATH}/navigation) #files shared by the navigation APIs -set(PRJ_SRC_GEN_POISERVICE_PATH ${PRJ_SRC_GEN_NAVIGATION_PATH}/poiservice) #files shared by the poiservice APIs +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 "v${API_VERSION_POISERVICE_MAJOR}") +set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi) +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 # Source Files FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) FILE(GLOB PRJ_PROXY_GEN_SRCS - ${PRJ_SRC_GEN_ROOT_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*Types.cpp ${PRJ_SRC_GEN_ROOT_PATH}/*DBusDeployment.cpp + ${PRJ_SRC_GEN_COMMON_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp ) @@ -78,7 +80,7 @@ set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_PROXY_GEN_SRCS}) include_directories( ${COMMON_DIR} ${COMMONAPI_GEN_DIR} - ${PRJ_SRC_GEN_ROOT_PATH} + ${PRJ_SRC_GEN_COMMON_PATH} ${PRJ_SRC_GEN_NAVIGATION_PATH} ${PRJ_SRC_GEN_POISERVICE_PATH} ${DBUS_INCLUDE_DIRS} diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp index 8f15d48..1ed3833 100644 --- a/test/poi-service/poi-manager-client/main.cpp +++ b/test/poi-service/poi-manager-client/main.cpp @@ -48,7 +48,7 @@ #include "poi-common-data-model.h" using namespace std; -using namespace v4::org::genivi::navigation::poiservice; +using namespace v2::org::genivi::navigation::poiservice; using namespace v4::org::genivi::navigation; using namespace v4::org::genivi; |