Improve the build (thanks to Jonathan Maw) and extend the log replayer

6 files changed, 40 insertions, 15 deletions

diff --git a/enhanced-position-service/CMakeLists.txt b/enhanced-position-service/CMakeLists.txt
new file mode 100644
index 0000000..e7035ae
--- /dev/null
+++ b/enhanced-position-service/CMakeLists.txt
@@ -0,0 +1,28 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: Positioning Top-level Makefile
+#
+# Author: Jonathan Maw
+#
+# Copyright (C) 2015, Codethink Ltd
+#
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Update (2015/05/11) : Jonathan Maw <jonathan.maw@codethink.co.uk>
+#               - First write
+# @licence end@
+###########################################################################
+cmake_minimum_required(VERSION 2.6.0)
+
+if(WITH_DBUS_INTERFACE)
+	add_subdirectory(dbus)
+endif(WITH_DBUS_INTERFACE)
+
+if(WITH_FRANCA_INTERFACE)
+	add_subdirectory(franca)
+endif(WITH_FRANCA_INTERFACE)
diff --git a/enhanced-position-service/dbus/CMakeLists.txt b/enhanced-position-service/dbus/CMakeLists.txt
index 0862ad4..c3f8fef 100644
--- a/enhanced-position-service/dbus/CMakeLists.txt
+++ b/enhanced-position-service/dbus/CMakeLists.txt
@@ -34,9 +34,6 @@ option(WITH_REPLAYER
 option(WITH_TESTS
     "Compile test applications" OFF)
 
-option(WITH_DEBUG 
-	"Enable the debug messages" OFF)
-
 message(STATUS)
 message(STATUS "---------------------------------------------------------")
 
@@ -65,8 +62,9 @@ endif()
 include_directories(src test ${gnss-service_INCLUDE_DIRS} ${sensors-service_INCLUDE_DIRS})
 
 add_subdirectory(api)
-add_subdirectory(src)
+message(STATUS "---------------------------------------------------------")
 
+add_subdirectory(src)
 message(STATUS "---------------------------------------------------------")
 
 if(WITH_TESTS)
diff --git a/enhanced-position-service/dbus/api/CMakeLists.txt b/enhanced-position-service/dbus/api/CMakeLists.txt
index 8763ed1..a191dc6 100644
--- a/enhanced-position-service/dbus/api/CMakeLists.txt
+++ b/enhanced-position-service/dbus/api/CMakeLists.txt
@@ -23,6 +23,7 @@ find_program(XSLTPROC xsltproc REQUIRED)
 find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
 set(GEN_DIR "${CMAKE_BINARY_DIR}/api")
+file(MAKE_DIRECTORY ${GEN_DIR})
 
 message(STATUS "CMAKE_CURRENT_SOURCE_DIR=" ${CMAKE_CURRENT_SOURCE_DIR})
 message(STATUS "CMAKE_BINARY_DIR=" "${CMAKE_BINARY_DIR}")
@@ -63,11 +64,9 @@ execute_process(
     OUTPUT_FILE positioning-constants.h
 )
 
-
-
-
-
-
-
-
-
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-enhancedposition.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-positionfeedback.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-configuration.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-constants.xml
+        DESTINATION share/dbus-1/interfaces
+)
diff --git a/enhanced-position-service/dbus/src/CMakeLists.txt b/enhanced-position-service/dbus/src/CMakeLists.txt
index 8f18022..c1010fc 100644
--- a/enhanced-position-service/dbus/src/CMakeLists.txt
+++ b/enhanced-position-service/dbus/src/CMakeLists.txt
@@ -79,5 +79,4 @@ message(STATUS "DBUS_CPP_LIBRARIES: " ${DBUS_CPP_LIBRARIES})
 message(STATUS "GNSS_SERVICE_LIBRARIES: " ${gnss-service_LIBRARIES})
 message(STATUS "SENSORS_SERVICE_LIBRARIES: " ${sensors-service_LIBRARIES})
 
-
-
+install(TARGETS enhanced-position-service DESTINATION bin)
diff --git a/enhanced-position-service/dbus/test/CMakeLists.txt b/enhanced-position-service/dbus/test/CMakeLists.txt
index 0ccc280..62e8009 100644
--- a/enhanced-position-service/dbus/test/CMakeLists.txt
+++ b/enhanced-position-service/dbus/test/CMakeLists.txt
@@ -61,6 +61,7 @@ target_link_libraries(enhanced-position-client ${LIBRARIES})
 
 message(STATUS "DBUS_CPP_LIBRARIES: " ${DBUS_CPP_LIBRARIES})
 
+install(TARGETS enhanced-position-client DESTINATION bin)
 
 
 
diff --git a/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt b/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt
index 918e579..9c90c72 100644
--- a/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt
+++ b/enhanced-position-service/dbus/test/compliance-test/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories( ${DBUS_INCLUDEDIR} ${DBUS_INCLUDE_DIRS} )
 
 link_directories ( ${DBUS_LIBDIR} ${DBUS_LIBRARY_DIRS}  )
 
-set(SRCS ${CMAKE_SOURCE_DIR}/test/compliance-test/enhanced-position-service-compliance-test.c)
+set(SRCS ${CMAKE_CURRENT_SOURCE_DIR}/enhanced-position-service-compliance-test.c)
 
 add_executable(enhanced-position-service-compliance-test ${SRCS})