X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=cf95ab04dbc2c6e7c29b17c31f37c6fe181cfc48;hb=7b336475a398d37c4d5c4a534c87919263ae4b01;hp=768d6b47c57cc9aba3e4350aa99a23b1ce83023f;hpb=c2a2b12c1ec1a4e17a3c95ceb8f010ce961a909e;p=apps%2Fagl-service-can-low-level.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 768d6b47..cf95ab04 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,12 +17,9 @@ # limitations under the License. ########################################################################### -project(ll-can) - -cmake_minimum_required(VERSION 3.3) - include(GNUInstallDirs) +set(TARGET "root@192.168.1.206") set(PROJECT_VERSION "0.1") set(PROJECT_ICON "icon.png") set(PROJECT_LIBDIR "libs") @@ -40,34 +37,55 @@ 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(-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) +pkg_check_modules(EXTRAS REQUIRED json-c libsystemd afb-daemon) add_compile_options(${EXTRAS_CFLAGS}) -include_directories(${EXTRAS_INCLUDE_DIRS} ${PROJECT_LIBDIR}/openxc-message-format/gen/cpp ${PROJECT_LIBDIR}/nanopb/) +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_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 +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.c) +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}-binding PROPERTIES +set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map" ) @@ -76,17 +94,29 @@ set_target_properties(${PROJECT_NAME}-binding PROPERTIES # WGT packaging 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 mkdir -p package/${PROJECT_LIBDIR} package/htdocs package/etc COMMAND cp config.xml package/ + COMMAND cp can_buses.json package/etc 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) + +########################################################################### +# WGT install + +#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 ssh ${TARGET} \"/usr/bin/afm-util remove ${PROJECT_NAME}@${PROJECT_VERSION} && /usr/bin/afm-util install /tmp/${PROJECT_NAME}.wgt\")" + )