aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-11-03 14:55:37 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:26 +0100
commit2be8e211634cf9fe8e59993d8cc4d984725dac37 (patch)
tree99f31b78cd6235fa96d911c03356009b773d9e32
parentaaefddc633408157f41e940f4c4f01563b03e655 (diff)
Fix: LUA support is CMake var not compile option
Add build dir as Path to search for plugins and lua Change-Id: I918f25dceeaf5ba4b9729c8d80fd40b936d9c1d6 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--conf.d/cmake/config.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 82db791..ce82d8b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -128,9 +128,9 @@ list(APPEND link_libraries afb-utilities lua-lib)
# -O2
# CACHE STRING "Compilation flags for RELEASE build type.")
-add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins")
-add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc")
-add_definitions(-DCONTROL_SUPPORT_LUA=1)
+set(CONTROL_SUPPORT_LUA 1)
+add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins")
+add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
add_definitions(-DCTL_PLUGIN_MAGIC=3286576532)
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]