X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=cf95ab04dbc2c6e7c29b17c31f37c6fe181cfc48;hb=7b336475a398d37c4d5c4a534c87919263ae4b01;hp=89e3361166d33bdae2691313f14a0483817e2132;hpb=83d422373a68d1ce17261488c70b717a36ebe51a;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89e33611..cf95ab04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,10 +17,6 @@
 # limitations under the License.
 ###########################################################################
 
-project(low-can-binding)
-
-cmake_minimum_required(VERSION 3.3)
-
 include(GNUInstallDirs)
 
 set(TARGET "root@192.168.1.206")
@@ -57,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})
 
@@ -69,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
 
@@ -83,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-bus.cpp can-message.cpp can-signals.cpp can-decoder.cpp obd2-signals.cpp signals.cpp openxc-utils.cpp timer.cpp)
-target_link_libraries(${PROJECT_NAME} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc pthread)
+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
+	diagnostic/diagnostic-message.cpp diagnostic/diagnostic-manager.cpp diagnostic/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 ""
@@ -103,9 +102,9 @@ 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
@@ -118,6 +117,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}:/tmp
+	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\")"
-	)
\ No newline at end of file
+	)