Changing to a raw pointer can_bus_dev member and add

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93b35c1..428f0a7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,12 +21,9 @@ project(low-can-binding)
 
 cmake_minimum_required(VERSION 3.3)
 
-# Include useful for CMakeTools VSCode extensions
-include(CMakeToolsHelpers REQUIRED)
-set(TARGET_DBG "root@192.168.1.206")
-
 include(GNUInstallDirs)
 
+set(TARGET "root@192.168.1.206")
 set(PROJECT_VERSION "0.1")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_LIBDIR "libs")
@@ -72,7 +69,7 @@ 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)
 
 ###########################################################################
 # the library used by the binding : openxc, bitfield, uds, isotp
@@ -86,7 +83,10 @@ 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-bus.cpp can-message.cpp can-signals.cpp can-decoder.cpp openxc-utils.cpp timer.cpp)
+add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}.cpp configuration.cpp
+       can/can-bus.cpp can/can-bus-dev.cpp can/can-message.cpp can/can-signals.cpp can/can-decoder.cpp
+       obd2/obd2-signals.cpp obd2/diagnostic-manager.cpp
+       utils/signals.cpp utils/openxc-utils.cpp utils/timer.cpp utils/socket.cpp)
 target_link_libraries(${PROJECT_NAME} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc pthread)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -121,6 +121,6 @@ add_custom_target(widget ALL DEPENDS ${PROJECT_NAME}.wgt)
 #message(STATUS "Creation of ${PROJECT_NAME}.wgt package for AppFW")
 ###########################################################################
 install(CODE "execute_process(
-       COMMAND scp -r ${CMAKE_SOURCE_DIR} ${PROJECT_NAME}.wgt ${TARGET_DBG}:/tmp
-       COMMAND ssh ${TARGET_DBG} \"/usr/bin/afm-util remove ${PROJECT_NAME}@${PROJECT_VERSION} && /usr/bin/afm-util install /tmp/${PROJECT_NAME}.wgt\")"
+       COMMAND scp -r ${CMAKE_SOURCE_DIR} ${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\")"
        )
\ No newline at end of file