From 19b95d5df6999a5a8a4e2fbbc2f58174ccb4411b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 10 Jul 2018 16:03:54 +0200 Subject: 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 --- conf.d/app-templates | 2 +- conf.d/cmake/config.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'conf.d') diff --git a/conf.d/app-templates b/conf.d/app-templates index eec9f07..332f377 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit eec9f0771c7574b3969831952cb5b6f54c576856 +Subproject commit 332f377e84a673cdcfe52ce71c932f39c4b48022 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] # --------------------------------------------------------------------- -- cgit 1.2.3-korg