remove hard coded path into CMake files

 - use cmake tools to find correct path for amb, dbus-1.0.
 - use cmake macro for to find ico-util directory.
 - hard link is inconsistent with yocto

Change-Id: I717c788c06725b63ea45c4ad8605bbfa72237c95
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec703f..ffeb24e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,9 @@ pkg_check_modules(json REQUIRED json)
 pkg_check_modules(ambd REQUIRED automotive-message-broker)
 pkg_check_modules(elementary REQUIRED elementary)
 pkg_check_modules(appcore-efl REQUIRED appcore-efl)
+pkg_check_modules(dbus REQUIRED dbus-1)
+
+FIND_FILE(ICO_UTIL_INCLUDE_DIR ico-util)
 
 set(include_dirs ${libtool_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${json_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/lib ${ambd_INCLUDE_DIRS})
 #set(link_libraries ${ambd_LIBRARIES} ${libtool_LIBRARY} ${json_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c1a1f81..a23b6ee 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(CheckIncludeFiles)
 
-include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS} /usr/include/amb /usr/include/dbus-1.0)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS} ${ambd_INCLUDE_DIRS} ${dbus_INCLUDE_DIRS} )
 set(CMAKE_CXX_FLAGS "-g -Wall -std=c++11 -O3")
 set(vehicleplugin_headers common.h abstractconfig.h ambconfig.h convert.h standardmessage.h datamessage.h eventmessage.h messageformat.h controlwebsocket.h mwinterface.h viccommunicator.h ambinterface.h)
 set(vehicleplugin_sources abstractconfig.cc ambconfig.cc convert.cc standardmessage.cc eventmessage.cc datamessage.cc mwinterface.cc controlwebsocket.cc viccommunicator.cc ambinterface.cc)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 46933cc..bd14474 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(CheckIncludeFiles)
 set(CMAKE_CXX_FLAGS "-g -Wall -std=c++11")
-include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS} ${ambd_INCLUDE_DIRS} ${appcore-efl_INCLUDE_DIRS}  ${elementary_INCLUDE_DIRS} /usr/include/ico-util ../src/)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${gio_INCLUDE_DIRS} ${gio-unix_INCLUDE_DIRS} ${ambd_INCLUDE_DIRS} ${appcore-efl_INCLUDE_DIRS}  ${elementary_INCLUDE_DIRS} ${ICO_UTIL_INCLUDE_DIR} ../src/)
 
 set(VICCommon_sources ../src/standardmessage.cc ../src/datamessage.cc ../src/eventmessage.cc controlwebsocketclient.cc)
 set(Common_sources ../src/abstractconfig.cc ../src/ambconfig.cc logresult.cc)

diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index 5669512..0229c25 100644 (file)
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 include(CheckIncludeFiles)
 
 set(ico_set_vehicleinfo_sources ico_set_vehicleinfo.c)
-include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} /usr/include/ico-util)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${ICO_UTIL_INCLUDE_DIR})
 add_executable(ico_set_vehicleinfo ${ico_set_vehicleinfo_sources})
 target_link_libraries(ico_set_vehicleinfo websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util)