some improvements of the build scripts

7 files changed, 29 insertions, 14 deletions

diff --git a/test/poi-service/CMakeLists.txt b/test/poi-service/CMakeLists.txt
index e45a8e4..a664a34 100644
--- a/test/poi-service/CMakeLists.txt
+++ b/test/poi-service/CMakeLists.txt
@@ -2,7 +2,7 @@
 # @licence app begin@
 # SPDX-License-Identifier: MPL-2.0
 #
-# Component Name: poi-service
+# Component Name: poi-service-client
 #
 # Author: Philippe Colliot
 #
@@ -15,12 +15,10 @@
 #
 # @licence end@
 ###########################################################################
-project(poi-service)
+project(poi-service-client)
 cmake_minimum_required(VERSION 2.8)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
-message(STATUS "poi-service-client")
+message(STATUS ${PROJECT_NAME})
 
 option(WITH_FRANCA_INTERFACE
        "Build using the Franca interfaces" OFF)
diff --git a/test/poi-service/README b/test/poi-service/README
index 92c2b78..184b05c 100644
--- a/test/poi-service/README
+++ b/test/poi-service/README
@@ -1,4 +1,4 @@
-Release date of the file: 03-08-2015 
+Release date of the file: 18-11-2015 
 Status: OK
 
 Project:
@@ -24,7 +24,8 @@ License:
 See headers and LICENSE file (mainly MPL V2)
 
 Test target: 
-Ubuntu 14.04 LTS
+Ubuntu 14.04 LTS 32bits
+Ubuntu 15.10 64bits
 
 Qt version:
 Qt5 (to get the version -> qtchooser -print-env, to set the version -> export QT-SELECT=<version>)
@@ -117,7 +118,11 @@ How To Build poi-common-manager-client (experimental)
 First you need to build the poi-manager-server, see the README in ../../src/poi-service
 
 cd build
+
+NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below:
+
 cmake -DWITH_FRANCA_INTERFACE=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/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-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../
+
 make
 
 ===============================
@@ -125,6 +130,11 @@ How To Run
 ===============================
 
 Launch the server (into ../../src/poi-service)
+
+Copy the configuration file ./resource/commonapi-dbus.ini in a directory of your choice
+Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the poi-manager-server.
+Example:
+export COMMONAPI_DBUS_DEFAULT_CONFIG=<your path>/commonapi-dbus.ini
 cp ./resource/poi-database-managed.db ./bin
 ./bin/poi-manager-server -f ./bin/poi-database-managed.db
 poi manager server started
diff --git a/test/poi-service/poi-client/CMakeLists.txt b/test/poi-service/poi-client/CMakeLists.txt
index ff73602..5cfe131 100644
--- a/test/poi-service/poi-client/CMakeLists.txt
+++ b/test/poi-service/poi-client/CMakeLists.txt
@@ -16,9 +16,10 @@
 # @licence end@
 ###########################################################################
 project(poi-client)
-cmake_minimum_required(VERSION 2.8)
+message(STATUS ${PROJECT_NAME})
 
-message(STATUS "poi-client")
+add_definitions("-std=gnu++11")
+add_definitions("-fPIC")
 
 find_package(PkgConfig REQUIRED)
 find_program(QTUIC uic REQUIRED)
diff --git a/test/poi-service/poi-contentaccess-module/CMakeLists.txt b/test/poi-service/poi-contentaccess-module/CMakeLists.txt
index ccce535..e0400b4 100644
--- a/test/poi-service/poi-contentaccess-module/CMakeLists.txt
+++ b/test/poi-service/poi-contentaccess-module/CMakeLists.txt
@@ -16,9 +16,10 @@
 # @licence end@
 ###########################################################################
 project(poi-contentaccess-module)
-cmake_minimum_required(VERSION 2.8)
+message(STATUS ${PROJECT_NAME})
 
-message(STATUS "poi-contentaccess-module")
+add_definitions("-std=gnu++11")
+add_definitions("-fPIC")
 
 find_package(PkgConfig REQUIRED)
 find_program(QTUIC uic REQUIRED)
diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt
index e85f635..ef1ee9d 100644
--- a/test/poi-service/poi-manager-client/CMakeLists.txt
+++ b/test/poi-service/poi-manager-client/CMakeLists.txt
@@ -16,6 +16,10 @@
 # @licence end@
 ###########################################################################
 project(poi-manager-client)
+message(STATUS ${PROJECT_NAME})
+
+add_definitions("-std=gnu++11")
+
 set(PARENT_API poiservice)
 set(ROOT_API navigation)
 set(API_VERSION_MAJOR 0)
diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp
index 7d33680..9072ad5 100644
--- a/test/poi-service/poi-manager-client/main.cpp
+++ b/test/poi-service/poi-manager-client/main.cpp
@@ -99,7 +99,7 @@ private:
     std::vector<POIServiceTypes::CategoryID> m_category_ids;
     std::vector<POIServiceTypes::POI_ID> m_poi_ids;
     POIServiceTypes::PoiAddedDetails m_poi;
-    POIServiceTypes::Locales m_locales;
+    NavigationTypes::Locales m_locales;
 
     std::string m_strTest;
 };
@@ -585,6 +585,7 @@ int main(int  argc , char**  argv )
     while (!myProxy->isAvailable()) {
         usleep(10);
     }
+    cout << "poi manager client started" << endl;
 
     //index used for argument analysis
     int next_option;
diff --git a/test/poi-service/poi-supplier/CMakeLists.txt b/test/poi-service/poi-supplier/CMakeLists.txt
index 4a0cbc0..18bb55f 100644
--- a/test/poi-service/poi-supplier/CMakeLists.txt
+++ b/test/poi-service/poi-supplier/CMakeLists.txt
@@ -16,9 +16,9 @@
 # @licence end@
 ###########################################################################
 project(poi-supplier)
-cmake_minimum_required(VERSION 2.8)
+message(STATUS ${PROJECT_NAME})
 
-message(STATUS "poi-supplier")
+add_definitions("-std=gnu++11")
 
 find_package(PkgConfig REQUIRED)