X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c60bc49bd0ed84820cfea2a0a80158b0c0e20213;hb=5800150cb6611075b712c0104773335550dd66e6;hp=91de0b3d1762676d538f38db5b4eb059f702b667;hpb=d59970dce571c1753174124326406ec1ff8e2ce8;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91de0b3d..c60bc49b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,7 @@
 # limitations under the License.
 ###########################################################################
 
-project(low-can)
+project(low-can-binding)
 
 cmake_minimum_required(VERSION 3.3)
 
@@ -40,35 +40,54 @@ add_compile_options(-Werror=implicit-function-declaration)
 add_compile_options(-ffunction-sections -fdata-sections)
 add_compile_options(-Wl,--as-needed -Wl,--gc-sections)
 add_compile_options(-fPIC)
-add_compile_options(-std=c++11 -D_REENTRANT)
+add_compile_options(-D_REENTRANT)
 
 set(CMAKE_C_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
 set(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_C_FLAGS_RELEASE      "-g -O2")
-set(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
+set(CMAKE_C_FLAGS_RELEASE      "-g -O0 -Wall -Werror")
+set(CMAKE_C_FLAGS_CCOV         "-g -O0 --coverage")
 
-set(CMAKE_CXX_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2")
-set(CMAKE_CXX_FLAGS_CCOV         "-g -O2 --coverage")
+set(CMAKE_CXX_FLAGS_PROFILING    "-g -O0 -std=c++11 -pg -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -std=c++11 -ggdb -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2 -std=c++11")
+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})
+
+# Needed to compile openxc-message-format library.
+#
+# The reason you need to do this is that some of your messages contain tag
+# numbers or field sizes that are larger than what can fit in the default
+# 8 bit descriptors.
+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)
-link_libraries(${EXTRAS_LIBRARIES})
 
+###########################################################################
+# the library used by the binding : openxc, bitfield, uds, isotp
+
+add_library(bitfield STATIC ${PROJECT_LIBDIR}/bitfield-c/src/bitfield/8byte.c ${PROJECT_LIBDIR}/bitfield-c/src/bitfield/bitarray.c ${PROJECT_LIBDIR}/bitfield-c/src/bitfield/bitfield.c ${PROJECT_LIBDIR}/bitfield-c/src/canutil/read.c ${PROJECT_LIBDIR}/bitfield-c/src/canutil/write.c)
+add_library(isotp STATIC ${PROJECT_LIBDIR}/isotp-c/src/isotp/isotp.c ${PROJECT_LIBDIR}/isotp-c/src/isotp/receive.c ${PROJECT_LIBDIR}/isotp-c/src/isotp/send.c)
+add_library(uds STATIC ${PROJECT_LIBDIR}/uds-c/src/uds/extras.c ${PROJECT_LIBDIR}/uds-c/src/uds/uds.c)
+add_library(openxc STATIC ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp/openxc.pb.c ${PROJECT_LIBDIR}/nanopb/pb_encode.c ${PROJECT_LIBDIR}/nanopb/pb_decode.c ${PROJECT_LIBDIR}/nanopb/pb_common.c)
 ###########################################################################
 # the binding for afb
 
 message(STATUS "Creation of ${PROJECT_NAME} binding for AFB-DAEMON")
 ###########################################################################
-add_library(${PROJECT_NAME}-binding MODULE ${PROJECT_NAME}-binding.cpp can-signals.cpp can-utils.cpp can_reader.cpp can_decode_message.cpp can_event_push.cpp openxc-utils.cpp timer.cpp)
+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}-binding PROPERTIES
+set_target_properties(${PROJECT_NAME} PROPERTIES
 	PREFIX ""
 	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
 )
@@ -79,15 +98,17 @@ set_target_properties(${PROJECT_NAME}-binding PROPERTIES
 message(STATUS "Creation of ${PROJECT_NAME}.wgt package for AppFW")
 ###############################################################
 configure_file(config.xml.in config.xml)
+configure_file(can_buses.json.in can_buses.json)
 
 add_custom_command(
 	OUTPUT ${PROJECT_NAME}.wgt
-	DEPENDS ${PROJECT_NAME}-binding
+	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 cp config.xml package/
+	COMMAND cp can_buses.json package/
 	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_ICON} package/icon.png
-	COMMAND cp ${PROJECT_NAME}-binding.so package
+	COMMAND cp ${PROJECT_NAME}.so package/libs
 	COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt package
 )
 add_custom_target(widget ALL DEPENDS ${PROJECT_NAME}.wgt)