Make it compatible with APIv3+DynAPI and bump submodules

Changes of app-templates:

(332f377 - Romain Forlot) Be able to overwrite BUILD_TYPE using CLI
(1ec7531 - Romain Forlot) Use CACHE variable for other common CMAKE variable
(0880356 - Romain Forlot) Fix:: wrong wgt using RELEASE BUILD TYPE
(eec9f07 - Romain Forlot) Fix: SYSROOT location detection... Wrong test.
(291aa4e - Romain Forlot) Change the default debug compilation options.
(22a2cbf - Romain Forlot) Clearer coverage compilation options configuration
(aa68dbd - Romain Forlot) Don't overwrite the autobuild script if it exists
(a13e7b9 - Romain Forlot) Disable the in-tree build method.
(51026d2 - Romain Forlot) Detect Yocto as OS distribution
(1f2944e - Romain Forlot) Fix: wrong compile options added
(92646f6 - Romain Forlot) Fallback using zip format if no wgtpkg-pack found
(f65761c - José Bollo) 02-variables.cmake: Avoid checking CXX version if not required
(3965d37 - José Bollo) config.cmake.sample: Remove dependency to libsystemd
(a45ae0c - José Bollo) config.cmake.sample: Remove dependency to libmicrohttpd
(9b17efe - Thierry Bultel) Added -D_FORTIFY_SOURCE=2 to CFLAGS

Changes of afb-helpers:

(52f0478 - Jonathan Aillet) Remove unnecessary 'AFB_DEBUG' redefinition
(fc1c62a - Jonathan Aillet) Use binding version to handle dynapi
(5811a53 - Jonathan Aillet) At search, use the prefix parameter as a prefix
(2c29f15 - Loïc Collignon) Remove deprecated use of cmake/Qt macro
(5bec8c5 - Loïc Collignon) Rename method to avoid conflict with Qt's one
(43ec971 - Sebastien Douheret) Fix warnings due to json-c evolution

Changes of app-controller:

(440be09 - Jonathan Aillet) Use binding version to set controller definitions
(67b6d49 - Clément Bénier) ctl-lua: typo fix
(bac7d6d - Clément Bénier) asynchronism for test: LockWait added
(4a72073 - Romain Forlot) Fix: plugin api assignement order
(e45d063 - Romain Forlot) Execute ConfigExec only if section is existing
(2d1c3d2 - Romain Forlot) Always set the api member even if NULL.
(9622138 - Romain Forlot) Ability to add a plugin after the initial load
(0f3063b - Romain Forlot) Be able to dispatch required api at the wanted time
(1ff524b - Romain Forlot) Change LUA package path at LUA interpreter load
(738ae54 - Romain Forlot) Don't load two times a plugin even for LUA

Change-Id: Ifeb3efc0c66dba5fd20383c7f0f368d9db4ab549
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 6 insertions, 6 deletions

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3c17187..536841b 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
 # -----------------------------
@@ -126,15 +126,15 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
 # CACHE STRING "Compilation flags for RELEASE build type.")
 
 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(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins")
+add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${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]
 # ---------------------------------------------------------------------
-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)
+set(CMAKE_PREFIX_PATH ${INSTALL_PREFIX}/lib64/pkgconfig ${INSTALL_PREFIX}/lib/pkgconfig)
+set(LD_LIBRARY_PATH ${INSTALL_PREFIX}/lib64 ${INSTALL_PREFIX}/lib)
 
 # Optional location for config.xml.in
 # -----------------------------------