summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-07-10 16:03:54 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-07-10 17:12:36 +0200
commit19b95d5df6999a5a8a4e2fbbc2f58174ccb4411b (patch)
treebb4fab784a3df748dc7c2a8f16694400b5816898
parente5c8bc9c8a7eb93a3a0a875d3fb61485d3f00a03 (diff)
Bump Submodules:
Update config.cmake to follow app-templates update. Submodule afb-helpers 5811a53..ee8dd11: > Use binding version to handle dynapi Submodule app-controller-submodule e45d063..5137a2c: > Use binding version to set controller definitions > ctl-lua: typo fix > asynchronism for test: LockWait added > Fix: plugin api assignement order Submodule conf.d/app-templates eec9f07..332f377: > Be able to overwrite BUILD_TYPE using CLI > Use CACHE variable for other common CMAKE variable > Fix:: wrong wgt using RELEASE BUILD TYPE Change-Id: I098393e537e7bd635ddbbe300c023e239ad25cd2 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------afb-helpers0
m---------app-controller-submodule0
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake4
4 files changed, 2 insertions, 2 deletions
diff --git a/afb-helpers b/afb-helpers
-Subproject 5811a53c29db2ee703b9eb5b6b303287a65f3f0
+Subproject ee8dd118a7bea7cd02cb9d54303f4f264c80b3a
diff --git a/app-controller-submodule b/app-controller-submodule
-Subproject e45d063fb5b4c45d92eb74df985075813e3b71a
+Subproject 5137a2c10c55fdd1cc999812ef1687f3546388a
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject eec9f0771c7574b3969831952cb5b6f54c57685
+Subproject 332f377e84a673cdcfe52ce71c932f39c4b4802
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index ca17cec..1fb97be 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -45,7 +45,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Default build type chosen. (Overwritten by cli if given)")
+#set(BUILD_TYPE "DEBUG")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.
@@ -129,7 +129,7 @@ set(CONTROL_SUPPORT_LUA 1)
add_definitions(-DCONTROL_PLUGIN_PATH="./var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var")
add_definitions(-DCONTROL_CONFIG_PATH="./etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
add_definitions(-DCTL_PLUGIN_MAGIC=1286576532)
-add_definitions(-DUSE_API_DYN=1 -DCONTROL_SUPPORT_LUA)
+add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI)
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------