diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-07-06 17:47:33 +0200 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:55:26 +0200 |
| commit | a5591f3b580b68bec363316236dd83e2d60c5d5f (patch) | |
| tree | 6109dea659405b667d1105a2b16bce778bf1e62a | |
| parent | ad171d8ab6a20599b73ea41feb95ce20e04d6fef (diff) | |
adjust CONTROL_CONFIG_PATH to point to .../etc
Same for CONTROL_PLUGIN_PATH with .../plugins and CONTROL_LUA_PATH
pointing to .../lua
This solves the issue when search for HAL files located in alternate
folders like etc.available or somewhere else in the package dir.
Change-Id: Ia35fe15f06665a58be8873e62fae0097ecd58971
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
| -rw-r--r-- | conf.d/cmake/config.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 98388ab..573a5fe 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -130,9 +130,9 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") # CACHE STRING "Compilation flags for RELEASE build type.") add_definitions(-DCTL_PLUGIN_MAGIC=7053042648) -add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:${CMAKE_BINARY_DIR}/package/etc") -add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:${CMAKE_BINARY_DIR}/package/lib/plugins") -add_definitions(-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:${CMAKE_BINARY_DIR}/package/data") +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") # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] |