diff options
Diffstat (limited to 'test/poi-service')
| -rw-r--r-- | test/poi-service/poi-manager-client/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | test/poi-service/poi-manager-client/main.cpp | 8 |
2 files changed, 15 insertions, 14 deletions
diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt index 78636b2..cd726e3 100644 --- a/test/poi-service/poi-manager-client/CMakeLists.txt +++ b/test/poi-service/poi-manager-client/CMakeLists.txt @@ -24,30 +24,30 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x") set(PARENT_API poiservice) set(ROOT_API navigation) set(API_VERSION_MAJOR 0) -set(API_VERSION_MINOR 1) -set(API_VERSION "v${API_VERSION_MAJOR}_${API_VERSION_MINOR}") +set(API_VERSION "v${API_VERSION_MAJOR}") set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") set(PRJ_SRC_GEN_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_API}/${PARENT_API}) set(PRJ_SRC_GEN_NAVIGATION_TYPES_PATH ${COMMONAPI_GEN_DIR}/org/genivi/${ROOT_API}) -set(PRJ_SRC_GEN_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/v1_0/org/genivi/${ROOT_API}/${PARENT_API}) - -set(DBUS_LIB_PATH "/usr/local/lib") +set(PRJ_SRC_GEN_POISERVICE_TYPES_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_API}/${PARENT_API}) # DBus Path if (DBUS_LIB_PATH) message(STATUS "DBUS_LIB_PATH = " ${DBUS_LIB_PATH}) + set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include) + set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib) + set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so) else() message(FATAL_ERROR "Please specify the path to your patched DBus library using -D DBUS_LIB_PATH=yourPath") endif() # Packages find_package(PkgConfig REQUIRED) -find_package(CommonAPI 3.1.2 REQUIRED) -find_package(CommonAPI-DBus 3.1.2 REQUIRED) +find_package(CommonAPI 3.1.5 REQUIRED) +find_package(CommonAPI-DBus 3.1.5 REQUIRED) -pkg_check_modules(DBUS "dbus-1 >= 1.4") -pkg_check_modules(COMMONAPI "CommonAPI >= 3.1") -pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1") +#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above) +pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5") +pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5") pkg_check_modules(SQLITE3 REQUIRED sqlite3) pkg_check_modules(GOBJECT gobject-2.0) @@ -94,6 +94,7 @@ set(LIBRARIES ${COMMONAPI_DBUS_LIBRARIES} ${GOBJECT_LIBRARIES} ${SQLITE3_LIBRARIES} + ${DBUS_LIBRARIES} ${GLIB_LIBRARIES} ${GTK_LIBRARIES} diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp index 6e59ac4..2a0eb3b 100644 --- a/test/poi-service/poi-manager-client/main.cpp +++ b/test/poi-service/poi-manager-client/main.cpp @@ -40,12 +40,12 @@ #include <functional> #include <CommonAPI/CommonAPI.hpp> //Defined in the Common API Runtime library -#include <v0_1/org/genivi/navigation/poiservice/POIContentAccessModuleProxy.hpp> +#include <v0/org/genivi/navigation/poiservice/POIContentAccessModuleProxy.hpp> #include "poi-common-data-model.h" using namespace std; -using namespace v0_1::org::genivi::navigation; +using namespace v0::org::genivi::navigation; using namespace poiservice; using namespace org::genivi::navigation; using namespace org::genivi; @@ -158,7 +158,7 @@ contentManager::contentManager(std::shared_ptr<POIContentAccessModuleProxyDefaul categoryOperatorList.push_back(categoryOperator); categoryAttribute.setOperators(categoryOperatorList); categoryAttributeList.push_back(categoryAttribute); - m_category.setAttributes(categoryAttributeList); + m_category.setAttributeList(categoryAttributeList); categorySortOption.setId(POIServiceTypes::SortOption::SORT_DEFAULT); categorySortOption.setName(""); @@ -183,7 +183,7 @@ contentManager::contentManager(std::shared_ptr<POIContentAccessModuleProxyDefaul POIServiceTypes::AttributeValue v(NEW_STARS_VALUE); poiAttribute.setValue(v); poiAttributeList.push_back(poiAttribute); - m_poi.setAttributes(poiAttributeList); + m_poi.setAttributeList(poiAttributeList); // init of the data test for search string m_strTest = SEARCH_STRING; |