diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-05-03 20:35:21 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-07-05 16:22:47 +0200 |
| commit | 1c93ff74e3e7ec828a21e9028b99cd46752ebce8 (patch) | |
| tree | 06b9ed43e55f70e354673d2e451f22e537e17b99 /conf.d/cmake/config.cmake | |
| parent | e72c4b089a2e6c9f8529f9a4031913b7ca11c8a3 (diff) | |
Rework loading sources and signals.
Some function that are now included in the controller submodule
do not need to be in the composer as well. Also initialize
sources and signals in the same way .
JSON configuration needs to be updated to fit this changes
Change-Id: I2043791e7ee80f8350f33ed15bdf9980c0773b82
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d/cmake/config.cmake')
| -rw-r--r-- | conf.d/cmake/config.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index adc3122..82e252a 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -129,9 +129,8 @@ list(APPEND link_libraries afb-helpers) # CACHE STRING "Compilation flags for RELEASE build type.") 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_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var") add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") -add_definitions(-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var:${CMAKE_BINARY_DIR}/package/var") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] |