soft tested under Ubuntu 15.10 64 bits

3 files changed, 10 insertions, 13 deletions

diff --git a/src/poi-service/README b/src/poi-service/README
index 41f347d..58a7ad4 100644
--- a/src/poi-service/README
+++ b/src/poi-service/README
@@ -87,6 +87,9 @@ It seems to have an issue with the .cmake files when two versions of CommonAPI a
 (see into /usr/local/lib/cmake/)
 
 =============
+For the Ubuntu 64 bits, due to the use of symbol versioning LIBDBUS_1_0 by CommonAPI-DBus, the patched version of dbus has to be >= 1.10.0
+
+=============
 In case the .pc are not well generated, please add these files to /usr/local/lib/pkgconfig
 
 CommonAPI.pc
diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt
index 8a86f4c..75cbca7 100644
--- a/src/poi-service/poi-manager-server/CMakeLists.txt
+++ b/src/poi-service/poi-manager-server/CMakeLists.txt
@@ -31,15 +31,6 @@ set(PRJ_SRC_GEN_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION}/org/genivi/${ROOT_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")
-
-# DBus Path
-if (DBUS_LIB_PATH)
-  message(STATUS "DBUS_LIB_PATH = " ${DBUS_LIB_PATH})
-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)
@@ -65,8 +56,8 @@ set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_COMMON_SRCS} ${PRJ_STUB_GEN_SRCS} ${PRJ_STU
 include_directories(
     ${COMMON_DIR}
     ${PRJ_SRC_GEN_PATH}
-    ${COMMONAPI_GEN_DIR}
     ${DBUS_INCLUDE_DIRS}
+    ${COMMONAPI_GEN_DIR}
     ${COMMONAPI_INCLUDE_DIRS}
     ${COMMONAPI_DBUS_INCLUDE_DIRS}
     ${GOBJECT_INCLUDE_DIRS}
@@ -75,15 +66,16 @@ include_directories(
 )
 
 link_directories(
-    ${DBUS_LIB_PATH}
-    ${GLIB_LIBRARY_DIRS}
+    ${DBUS_LIBDIR}
     ${COMMONAPI_LIBDIR}
     ${COMMONAPI_DBUS_LIBDIR}
     ${GOBJECT_LIBRARY_DIRS}
+    ${GLIB_LIBRARY_DIRS}
     ${SQLITE3_LIBRARY_DIRS}
 )
 
 set(LIBRARIES
+    ${DBUS_LIBRARIES}
     ${COMMONAPI_LIBRARIES}
     ${COMMONAPI_DBUS_LIBRARIES}
     ${GOBJECT_LIBRARIES}
diff --git a/src/poi-service/rebuild_all.sh b/src/poi-service/rebuild_all.sh
index b927def..25f4067 100755
--- a/src/poi-service/rebuild_all.sh
+++ b/src/poi-service/rebuild_all.sh
@@ -14,8 +14,10 @@ rm -rf build
 mkdir build
 cd build
 
+OS_VERSION=$(uname -i)
+
 echo 'build with CommonAPI'
-cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DBUS_INTERFACE=OFF -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../
+cmake -DWITH_FRANCA_DBUS_INTERFACE=ON -DWITH_DBUS_INTERFACE=OFF -DCOMMONAPI_DBUS_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-dbus-tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/$OS_VERSION/commonapi-dbus-generator-linux-$OS_VERSION -DCOMMONAPI_TOOL_GENERATOR=$COMMON_API_ROOT_DIR/common-api-tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/$OS_VERSION/commonapi-generator-linux-$OS_VERSION -DWITH_DEBUG=ON . ../
 
 make