Wrong call to thread.join cause deadlock and thread termination.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c2ffff..c60bc49 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,6 +57,8 @@ set(CMAKE_CXX_FLAGS_CCOV         "-g -O2 -std=c++11 --coverage")
 include(FindPkgConfig)
 
 pkg_check_modules(EXTRAS REQUIRED json-c afb-daemon)
+#set(THREADS_PREFER_PTHREAD_FLAG ON)
+#find_package(Threads REQUIRED)
 add_compile_options(${EXTRAS_CFLAGS})
 add_compile_options(${EXTRAS_CXXFLAGS})
 
@@ -82,8 +84,8 @@ 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 can-bus.cpp can-message.cpp can-signals.cpp can-decoder.cpp openxc-utils.cpp timer.cpp)
+target_link_libraries(${PROJECT_NAME} ${EXTRAS_LIBRARIES} bitfield isotp uds openxc pthread)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
        PREFIX ""
@@ -106,10 +108,6 @@ add_custom_command(
        COMMAND cp config.xml package/
        COMMAND cp can_buses.json package/
        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_ICON} package/icon.png
-       COMMAND cp libbitfield.a package/libs
-       COMMAND cp libisotp.a package/libs
-       COMMAND cp libuds.a package/libs
-       COMMAND cp libopenxc.a package/libs
        COMMAND cp ${PROJECT_NAME}.so package/libs
        COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt package
 )