diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-11-02 15:58:45 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-14 11:00:25 +0100 |
| commit | 6ee4db6878464642ddf9f0909748841a45b58a88 (patch) | |
| tree | 4c3588d216e903174f1281b757e98816d7323afa /conf.d | |
| parent | ed2c3d0267e3c5e1392635dacad2752de935d6b4 (diff) | |
Migrate to ctl-utilities library
New version of controller as a library. Loading additionnals
files from each sections.
Change-Id: I4f5e78d0baf9650cb8d1cc1da26f8e1fd73b792c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/cmake/config.cmake | 8 | ||||
| -rw-r--r-- | conf.d/project/etc/sources.json | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 86831e8..77102a3 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -128,8 +128,10 @@ list(APPEND link_libraries afb-utilities lua-lib) # -O2 # CACHE STRING "Compilation flags for RELEASE build type.") -add_definitions("-DCONTROL_SUPPORT_LUA=1") -add_definitions("-DCTL_PLUGIN_MAGIC=3286576532") +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) +add_definitions(-DCTL_PLUGIN_MAGIC=3286576532) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- @@ -139,7 +141,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) # Optional location for config.xml.in # ----------------------------------- #set(WIDGET_ICON conf.d/wgt/${PROJECT_ICON} CACHE PATH "Path to the widget icon") -#set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)") +set(WIDGET_CONFIG_TEMPLATE "${CMAKE_SOURCE_DIR}/conf.d/wgt/config.xml.in" CACHE PATH "Path to widget config file template (config.xml.in)") # Mandatory widget Mimetype specification of the main unit # -------------------------------------------------------------------------- diff --git a/conf.d/project/etc/sources.json b/conf.d/project/etc/sources.json index 0d04880..84a39fa 100644 --- a/conf.d/project/etc/sources.json +++ b/conf.d/project/etc/sources.json @@ -2,7 +2,7 @@ "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "sources": [ { - "uid": "-serviceCAN", + "uid": "CAN-service", "api": "low-can", "info": "Low level binding to handle CAN bus communications", "getSignals": { |