From 63dc64fb90311eb1942d81e32e1a879798403258 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 10 Jul 2018 19:03:22 +0200 Subject: Bump Submodules Submodule afb-helpers 5811a53..52f0478: > Remove unnecessary 'AFB_DEBUG' redefinition > Use binding version to handle dynapi Submodule app-controller-submodule e45d063..440be09: > 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 0880356..332f377: > Be able to overwrite BUILD_TYPE using CLI > Use CACHE variable for other common CMAKE variable Change-Id: I455c7132ccd9266b8e77a5a8c02fd7501f577c11 Signed-off-by: Romain Forlot --- afb-helpers | 2 +- app-controller-submodule | 2 +- conf.d/app-templates | 2 +- conf.d/cmake/config.cmake | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/afb-helpers b/afb-helpers index 5811a53..52f0478 160000 --- a/afb-helpers +++ b/afb-helpers @@ -1 +1 @@ -Subproject commit 5811a53c29db2ee703b9eb5b6b303287a65f3f04 +Subproject commit 52f04783535948f2782780992710276f3419e56e diff --git a/app-controller-submodule b/app-controller-submodule index e45d063..440be09 160000 --- a/app-controller-submodule +++ b/app-controller-submodule @@ -1 +1 @@ -Subproject commit e45d063fb5b4c45d92eb74df985075813e3b71a4 +Subproject commit 440be0984f16562fdf321c770d65787ecea0e36d diff --git a/conf.d/app-templates b/conf.d/app-templates index 0880356..332f377 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 08803561c89dd761a26e6a236829c5141056c969 +Subproject commit 332f377e84a673cdcfe52ce71c932f39c4b48022 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index c460da6..c12dbe6 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -77,7 +77,7 @@ set (PKG_REQUIRED_LIST # 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 # ----------------------------- @@ -129,7 +129,7 @@ set(CONTROL_SUPPORT_LUA 1) add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) -add_definitions(-DUSE_API_DYN=1) +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