X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf.d%2Fcmake%2Fconfig.cmake;h=3453d6602eb05b11420d9ee8335d4090d7c4ece2;hb=7c588f697c55b14fbbb0d6245d4f02f4a99412b3;hp=59a256676093a6a40fd4e7ad82370445ea1ea461;hpb=6faef2305955b025c3cf1cfaf17a6aa073727c24;p=apps%2Fagl-service-can-low-level.git

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 59a25667..3453d660 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,26 +18,62 @@
 
 # Project Info
 # ------------------
-set(PROJECT_NAME low-can-service)
+set(PROJECT_NAME agl-service-can-low-level)
 set(PROJECT_PRETTY_NAME "Low level CAN binding")
 set(PROJECT_DESCRIPTION "Expose CAN Low Level APIs through AGL Framework")
-set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/apps/low-level-can-service")
+set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-can-low-level")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_AUTHOR "Romain Forlot")
 set(PROJECT_AUTHOR_MAIL "romain.forlot@iot.bzh")
 set(PROJECT_LICENSE "APL2.0")
 set(PROJECT_LANGUAGES "C;CXX")
+set(API_NAME "low-can")
 
-# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# Where are stored the project configuration files
 # relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+set(PROJECT_CMAKE_CONF_DIR "conf.d")
 
 # Which directories inspect to find CMakeLists.txt target files
 # set(PROJECT_SRC_DIR_PATTERN "*")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "DEBUG" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)")
+
+# Activate J1939
+# Need module in kernel
+# --------------
+
+execute_process(COMMAND ls $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/can/j1939.h RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+
+if(result)
+	message("Feature J1939 disabled")
+	set(WITH_FEATURE_J1939 OFF)
+else()
+	message("Feature J1939 enabled")
+	set(WITH_FEATURE_J1939 ON)
+	add_definitions(-DUSE_FEATURE_J1939)
+	# Define name for ECU
+	set(J1939_NAME_ECU 0x1239)
+	add_definitions(-DJ1939_NAME_ECU=${J1939_NAME_ECU})
+endif()
+
+# Activate ISO TP
+# Need module in kernel
+# --------------
+
+execute_process(COMMAND ls $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/can/isotp.h RESULT_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET)
+
+if(result2)
+    message("Feature ISO TP disabled")
+    set(WITH_FEATURE_ISOTP OFF)
+else()
+    message("Feature ISOTP enabled")
+    set(WITH_FEATURE_ISOTP ON)
+    add_definitions(-DUSE_FEATURE_ISOTP)
+endif()
+
+
 
 # Kernel selection if needed. You can choose between a
 # mandatory version to impose a minimal version.
@@ -63,18 +99,21 @@ set (PKG_REQUIRED_LIST
 	json-c
 	libsystemd>=222
 	afb-daemon
-	libmicrohttpd>=0.9.55
+	afb-helpers
+	appcontroller
 )
 
 # Prefix path where will be installed the files
 # Default: /usr/local (need root permission to write in)
 # ------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
 
 # Customize link option
 # -----------------------------
 list (APPEND link_libraries -pthread)
 
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+
 # Compilation options definition
 # Use CMake generator expressions to specify only for a specific language
 # Values are prefilled with default options that is currently used.
@@ -89,38 +128,36 @@ set(COMPILE_OPTIONS
  -Wno-sign-compare
  -Wno-sign-conversion
  -Werror=maybe-uninitialized
- -Werror=implicit-function-declaration
  -ffunction-sections
  -fdata-sections
  -fPIC
  -DPB_FIELD_16BIT
  CACHE STRING "Compilation flags")
 #set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.")
-set(CXX_COMPILE_OPTIONS -pthread CACHE STRING "Compilation flags for C++ language.")#set(PROFILING_COMPILE_OPTIONS
+set(CXX_COMPILE_OPTIONS -pthread CACHE STRING "Compilation flags for C++ language.")
+#set(PROFILING_COMPILE_OPTIONS
 # -g
 # -O0
 # -pg
 # -Wp,-U_FORTIFY_SOURCE
 # CACHE STRING "Compilation flags for PROFILING build type.")
 #set(DEBUG_COMPILE_OPTIONS
+# -Og
 # -g
 # -ggdb
-# -Wp,-U_FORTIFY_SOURCE
+# -D_FORTIFY_SOURCE=2
 # CACHE STRING "Compilation flags for DEBUG build type.")
-#set(CCOV_COMPILE_OPTIONS
+#set(COVERAGE_COMPILE_OPTIONS
 # -g
 # -O2
 # --coverage
-# CACHE STRING "Compilation flags for CCOV build type.")
+# CACHE STRING "Compilation flags for COVERAGE build type.")
 #set(RELEASE_COMPILE_OPTIONS
-# -g
 # -O2
+# -D_FORTIFY_SOURCE=2
 # CACHE STRING "Compilation flags for RELEASE build type.")
 
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+add_definitions(-DAFB_BINDING_VERSION=3)
 
 # Optional location for config.xml.in
 # -----------------------------------
@@ -149,7 +186,7 @@ set(WIDGET_TYPE application/vnd.agl.service)
 # This is the file that will be executed, loaded,
 # at launch time by the application framework.
 #
-set(WIDGET_ENTRY_POINT lib/afb-low-can.so)
+set(WIDGET_ENTRY_POINT lib/afb-low-can-binding.so)
 
 # Optional dependencies order
 # ---------------------------
@@ -182,6 +219,13 @@ set(AFB_REMPORT "1234" CACHE STRING "Default binder listening port")
 set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs  --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
 set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
 
+
+# Add Controller config
+add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${CMAKE_BINARY_DIR}/package-test")
+add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_BINARY_DIR}/package-test/")
+
+
+
 # Optional schema validator about now only XML, LUA and JSON
 # are supported
 #------------------------------------------------------------
@@ -191,5 +235,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
 
 # This include is mandatory and MUST happens at the end
 # of this file, else you expose you to unexpected behavior
+#
+# This CMake module could be found at the following url:
+# https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module
 # -----------------------------------------------------------
-include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
+include(CMakeAfbTemplates)