Fix: return before initialization of diagnostic manager.

[apps/agl-service-can-low-level.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f6ac96..962b41b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,12 +17,9 @@
 # limitations under the License.
 ###########################################################################
 
-project(low-can-binding)
-
-cmake_minimum_required(VERSION 3.3)
-
 include(GNUInstallDirs)
 
+set(TARGET "root@192.168.1.206")
 set(PROJECT_VERSION "0.1")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_LIBDIR "libs")
@@ -56,7 +53,7 @@ set(CMAKE_CXX_FLAGS_CCOV         "-g -O2 -std=c++11 --coverage")
 
 include(FindPkgConfig)
 
-pkg_check_modules(EXTRAS REQUIRED json-c afb-daemon)
+pkg_check_modules(EXTRAS REQUIRED json-c libsystemd afb-daemon)
 add_compile_options(${EXTRAS_CFLAGS})
 add_compile_options(${EXTRAS_CXXFLAGS})
 
@@ -68,8 +65,8 @@ add_compile_options(${EXTRAS_CXXFLAGS})
 add_definitions(-DPB_FIELD_16BIT)
 
 # Needed extra directories to hit the required headers files.
-include_directories(${EXTRAS_INCLUDE_DIRS} ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp ${PROJECT_LIBDIR}/nanopb/  ${PROJECT_LIBDIR}/uds-c/src  ${PROJECT_LIBDIR}/bitfield-c/src ${PROJECT_LIBDIR}/isotp-c/src)
-
+include_directories(${EXTRAS_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR} ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp ${PROJECT_LIBDIR}/nanopb/  ${PROJECT_LIBDIR}/uds-c/src  ${PROJECT_LIBDIR}/bitfield-c/src ${PROJECT_LIBDIR}/isotp-c/src)
+link_libraries(${EXTRAS_LIBRARIES})
 ###########################################################################
 # the library used by the binding : openxc, bitfield, uds, isotp
 
@@ -82,8 +79,11 @@ add_library(openxc STATIC ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp/openxc
 
 message(STATUS "Creation of ${PROJECT_NAME} binding for AFB-DAEMON")
 ###########################################################################
-add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp can-signals.cpp can-utils.cpp can_reader.cpp can_decode_message.cpp can_event_push.cpp openxc-utils.cpp timer.cpp)
-target_link_libraries(${PROJECT_NAME} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc)
+add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp configuration.cpp configuration-generated.cpp
+       can/can-bus.cpp can/can-bus-dev.cpp can/can-message-set.cpp can/can-message-definition.cpp can/can-message.cpp can/can-signals.cpp can/can-decoder.cpp
+       obd2/obd2-signals.cpp obd2/diagnostic-manager.cpp obd2/active-diagnostic-request.cpp
+       utils/signals.cpp utils/openxc-utils.cpp utils/timer.cpp utils/socket.cpp)
+target_link_libraries(${PROJECT_NAME} pthread bitfield uds isotp openxc)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
        PREFIX ""
@@ -94,7 +94,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 # WGT packaging
 
 message(STATUS "Creation of ${PROJECT_NAME}.wgt package for AppFW")
-###############################################################
+###########################################################################
 configure_file(config.xml.in config.xml)
 configure_file(can_buses.json.in can_buses.json)
 
@@ -102,11 +102,21 @@ add_custom_command(
        OUTPUT ${PROJECT_NAME}.wgt
        DEPENDS ${PROJECT_NAME} bitfield isotp uds openxc config.xml.in can_buses.json.in
        COMMAND rm -rf package
-       COMMAND mkdir -p package/${PROJECT_LIBDIR} package/htdocs
+       COMMAND mkdir -p package/${PROJECT_LIBDIR} package/htdocs package/etc
        COMMAND cp config.xml package/
-       COMMAND cp can_buses.json package/
+       COMMAND cp can_buses.json package/etc
        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_ICON} package/icon.png
        COMMAND cp ${PROJECT_NAME}.so package/libs
        COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt package
 )
 add_custom_target(widget ALL DEPENDS ${PROJECT_NAME}.wgt)
+
+###########################################################################
+# WGT install
+
+#message(STATUS "Creation of ${PROJECT_NAME}.wgt package for AppFW")
+###########################################################################
+install(CODE "execute_process(
+       COMMAND scp -r ${CMAKE_SOURCE_DIR} src/${PROJECT_NAME}.wgt ${TARGET}:/tmp
+       COMMAND ssh ${TARGET} \"/usr/bin/afm-util remove ${PROJECT_NAME}@${PROJECT_VERSION} && /usr/bin/afm-util install /tmp/${PROJECT_NAME}.wgt\")"
+       )