diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2018-06-14 02:37:20 +0200 |
|---|---|---|
| committer |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:53:53 +0200 |
| commit | 5f084f556b30b82748926147902549ec8814f941 (patch) | |
| tree | 2832477760f1600616a6c097051569c993c98aba | |
| parent | e9cf87ac429153c696678784a70ea70cfdffd27f (diff) | |
config.cmake: adjust paths (CONTROL_*_PATH)
At runtime, the controller should search paths inside
${CMAKE_INSTALL_PREFIX}/${PROJECt_NAME}, typically:
/usr/libexec/agl/4a-hal/
Change-Id: I8165a1c389dcb7e24d0e336918f0698295de1c23
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 eb64358..98388ab 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}/4a-hal-cfg-community:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/4a-hal-cfg-reference:${CMAKE_BINARY_DIR}/package/etc") -add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lib:${CMAKE_BINARY_DIR}/package/lib/plugins") -add_definitions(-DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lua:${CMAKE_BINARY_DIR}/package/data") +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") # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] |