X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=962b41b7cd520cb519500486a6194b5b7c443dee;hb=c6e3d9484ac4321e586586005269521b92e99027;hp=44114e12373e59b8b9c08acd7d6e7d3597ff5edb;hpb=19c0faf5dcb5c7e58136f6ba56c65535baac2efb;p=apps%2Flow-level-can-service.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44114e1..962b41b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,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})
 
@@ -66,7 +66,7 @@ add_definitions(-DPB_FIELD_16BIT)
 
 # Needed extra directories to hit the required headers files.
 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
 
@@ -79,11 +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 configuration.cpp
-	can/can-bus.cpp can/can-bus-dev.cpp can/can-message.cpp can/can-signals.cpp can/can-decoder.cpp
+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} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc pthread)
+target_link_libraries(${PROJECT_NAME} pthread bitfield uds isotp openxc)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
 	PREFIX ""
@@ -102,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