summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-07-10 17:30:05 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:55:26 +0200
commit9258a25a5737fa347777a114907441dc53f3595c (patch)
treeab91405f54ed72a9a8bbac901f6c332dc92ecab4
parentf52f5e9e9e402ea4bb3cbc5509ed633f4c66f4de (diff)
Set binding api version directly in top cmake
Bump 'afb-helpers' and 'app-controller' submodules. Set binding api version directly in top cmake of '4a-hal-generic' repository (that became mandatory with submodules updates). Change-Id: I05de046c6435296bc1ea73eba6e12e3b34b4afad Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
m---------afb-helpers0
m---------app-controller0
-rw-r--r--conf.d/cmake/00-debian-osconfig.cmake1
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake3
-rw-r--r--conf.d/cmake/00-suse-config.cmake1
-rw-r--r--conf.d/cmake/config.cmake2
6 files changed, 2 insertions, 5 deletions
diff --git a/afb-helpers b/afb-helpers
-Subproject 5811a53c29db2ee703b9eb5b6b303287a65f3f0
+Subproject 52f04783535948f2782780992710276f3419e56
diff --git a/app-controller b/app-controller
-Subproject 67b6d49ee0edca5177232cf9978b41d5c098f15
+Subproject 440be0984f16562fdf321c770d65787ecea0e36
diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake
index 64bc678..4042718 100644
--- a/conf.d/cmake/00-debian-osconfig.cmake
+++ b/conf.d/cmake/00-debian-osconfig.cmake
@@ -1,3 +1,2 @@
list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
-add_compile_options(-DUSE_API_DYN)
set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) \ No newline at end of file
diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake
index 7762c85..182caeb 100644
--- a/conf.d/cmake/00-default-osconfig.cmake
+++ b/conf.d/cmake/00-default-osconfig.cmake
@@ -1,2 +1 @@
-list(APPEND PKG_REQUIRED_LIST lua>=5.3)
-add_compile_options(-DUSE_API_DYN) \ No newline at end of file
+list(APPEND PKG_REQUIRED_LIST lua>=5.3) \ No newline at end of file
diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake
index a08a2d4..d259a21 100644
--- a/conf.d/cmake/00-suse-config.cmake
+++ b/conf.d/cmake/00-suse-config.cmake
@@ -1,4 +1,3 @@
add_definitions(-DSUSE_LUA_INCDIR)
list(APPEND PKG_REQUIRED_LIST lua>=5.3)
-add_compile_options(-DUSE_API_DYN)
set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) \ No newline at end of file
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 573a5fe..7f4245d 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -133,7 +133,7 @@ add_definitions(-DCTL_PLUGIN_MAGIC=7053042648)
add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins")
add_definitions(-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/data:${CMAKE_BINARY_DIR}/package/data")
-
+add_definitions(-DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI=1)
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------