Fix: make sure install execute sequentially

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fd7e06..4c4132b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,9 +79,9 @@ 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
-       obd2/obd2-signals.cpp obd2/diagnostic-manager.cpp obd2/active-diagnostic-request.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
+       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)
 
@@ -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
@@ -117,6 +117,7 @@ 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} src/${PROJECT_NAME}.wgt ${TARGET}:/tmp
+       COMMAND scp -r src/${PROJECT_NAME}.wgt ${CMAKE_SOURCE_DIR} ${TARGET}:/tmp)"
+       CODE "execute_process(
        COMMAND ssh ${TARGET} \"/usr/bin/afm-util remove ${PROJECT_NAME}@${PROJECT_VERSION} && /usr/bin/afm-util install /tmp/${PROJECT_NAME}.wgt\")"
        )