aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--CAN-binder/CMakeLists.txt2
m---------CAN-binder/conf.d0
-rw-r--r--CAN-binder/conf.d/config.cmake98
m---------CAN-binder/conf.d/default0
5 files changed, 102 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 3bf958b4..e65999e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "CAN-binder/conf.d"]
- path = CAN-binder/conf.d
- url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git
+[submodule "CAN-binder/conf.d/default"]
+ path = CAN-binder/conf.d/default
+ url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
branch = reference
diff --git a/CAN-binder/CMakeLists.txt b/CAN-binder/CMakeLists.txt
index c1dd040a..5fbeb193 100644
--- a/CAN-binder/CMakeLists.txt
+++ b/CAN-binder/CMakeLists.txt
@@ -19,7 +19,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/macros.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/default/cmake/common.cmake)
# Bindings to compile
# --------------------
diff --git a/CAN-binder/conf.d b/CAN-binder/conf.d
deleted file mode 160000
-Subproject d77fcdaeb249fb1b82703b3d033126cee2c3c3e
diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
new file mode 100644
index 00000000..d0e879a1
--- /dev/null
+++ b/CAN-binder/conf.d/config.cmake
@@ -0,0 +1,98 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Project Info
+# ------------------
+set(PROJECT_NAME low-can-project)
+set(VERSION "1.0")
+set(PROJECT_PRETTY_NAME "Low level CAN binding")
+set(PROJECT_DESCRIPTION "Expose CAN Low Level APIs through AGL Framework")
+set(PROJECT_URL "https://github.com/iotbzh/CAN_signaling")
+set(PROJECT_AUTHOR "Romain Forlot")
+set(PROJECT_AUTHOR_MAIL "romain.forlot@iot.bzh")
+set(PROJECT_ICON "icon.png")
+set(PROJECT_LANGUAGES,"C")
+
+# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# relative to the root project directory
+set(PROJECT_APP_TEMPLATES_DIR "conf.d")
+
+# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
+# but used and must be built and linked.
+# set(PROJECT_LIBDIR "libs")
+
+# Where are stored data for your application. Pictures, static resources must be placed in that folder.
+# set(PROJECT_RESOURCES "data")
+
+# Compilation Mode (DEBUG, RELEASE)
+# ----------------------------------
+set(CMAKE_BUILD_TYPE "DEBUG")
+
+# Compiler selection if needed. Overload the detected compiler.
+# -----------------------------------------------
+set (gcc_minimal_version 4.9)
+
+# PKG_CONFIG required packages
+# -----------------------------
+set (PKG_REQUIRED_LIST
+ json-c
+ libsystemd
+ afb-daemon
+)
+
+# Static constante definition
+# -----------------------------
+add_compile_options(-D_REENTRANT)
+add_compile_options(-DPB_FIELD_16BIT)
+
+# LANG Specific compile flags set for all build types
+set(CMAKE_C_FLAGS "")
+set(CMAKE_CXX_FLAGS "-std=c++11")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --ldpaths=\$\$(pwd)/package/lib --port=1234 --roothttp=\$\$(pwd)/package/htdocs --tracereq=common --token=\"1\" --verbose")
+set(WIDGET_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
+
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
+# ---------------------------------------------------------------------
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+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)
+
+# Optional dependencies order
+# ---------------------------
+#set(EXTRA_DEPENDENCIES_ORDER)
+
+# Optional Extra global include path
+# -----------------------------------
+#set(EXTRA_INCLUDE_DIRS)
+
+# Optional extra libraries
+# -------------------------
+#set(EXTRA_LINK_LIBRARIES)
+
+# Optional force binding installation
+# ------------------------------------
+set(BINDINGS_INSTALL_PREFIX /opt )
+# set(WIDGET_PREFIX DestinationPath)
+
+# Optional force binding Linking flag
+# ------------------------------------
+# set(BINDINGS_LINK_FLAG LinkOptions )
+
diff --git a/CAN-binder/conf.d/default b/CAN-binder/conf.d/default
new file mode 160000
+Subproject f8e95903ac0f2937289bb3e1dcb27899c03b8cc