summaryrefslogtreecommitdiffstats
path: root/conf.d/cmake
diff options
context:
space:
mode:
authorArthur Guyader <arthur.guyader@iot.bzh>2019-11-07 14:16:16 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2020-01-09 10:43:00 +0100
commit8b3af0fccba13e4098590322975bbd475d3d4f9e (patch)
tree29333136c9bca78a421697c048fd5379b062da88 /conf.d/cmake
parent4e1db7198dc91adce159abbea60667400569d38c (diff)
controller: Prepare project ot use the Controller
Initialize an empty message_set to fill later when loading the Plugins Add the required method to be able to add a message_set Bug-AGL: SPEC-2988 Change-Id: I1dc784648f69832de8681184adaccbf5300f831d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d/cmake')
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake1
-rw-r--r--conf.d/cmake/00-suse-config.cmake2
-rw-r--r--conf.d/cmake/01-debian-config.cmake1
-rw-r--r--conf.d/cmake/01-ubuntu-config.cmake1
-rw-r--r--conf.d/cmake/config.cmake10
5 files changed, 14 insertions, 1 deletions
diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake
new file mode 100644
index 00000000..a2b9325c
--- /dev/null
+++ b/conf.d/cmake/00-default-osconfig.cmake
@@ -0,0 +1 @@
+list(APPEND PKG_REQUIRED_LIST lua>=5.3)
diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake
new file mode 100644
index 00000000..8c8303ba
--- /dev/null
+++ b/conf.d/cmake/00-suse-config.cmake
@@ -0,0 +1,2 @@
+add_definitions(-DSUSE_LUA_INCDIR)
+list(APPEND PKG_REQUIRED_LIST lua>=5.3)
diff --git a/conf.d/cmake/01-debian-config.cmake b/conf.d/cmake/01-debian-config.cmake
new file mode 100644
index 00000000..0e5a695e
--- /dev/null
+++ b/conf.d/cmake/01-debian-config.cmake
@@ -0,0 +1 @@
+list(APPEND PKG_REQUIRED_LIST lua53-c++>=5.3)
diff --git a/conf.d/cmake/01-ubuntu-config.cmake b/conf.d/cmake/01-ubuntu-config.cmake
new file mode 100644
index 00000000..0e5a695e
--- /dev/null
+++ b/conf.d/cmake/01-ubuntu-config.cmake
@@ -0,0 +1 @@
+list(APPEND PKG_REQUIRED_LIST lua53-c++>=5.3)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 0f678433..d7d5f43e 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -38,7 +38,7 @@ set(PROJECT_CMAKE_CONF_DIR "conf.d")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(BUILD_TYPE "RELEASE" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)")
+set(BUILD_TYPE "DEBUG" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)")
# Activate J1939
# Need module in kernel
@@ -100,6 +100,7 @@ set (PKG_REQUIRED_LIST
libsystemd>=222
afb-daemon
afb-helpers
+ appcontroller
)
# Prefix path where will be installed the files
@@ -216,6 +217,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
#------------------------------------------------------------