From f014ab7d61a39dd8950e544ec10603085696fc2b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 20 Jun 2018 15:17:53 +0200 Subject: Add relative etc, var directories to search path The test would be stored in the tested binding and not the test binding so lua file and json configuration would have to be found in the tested binding root directory. Change-Id: I1c60ff7b31fd14ca7a88e1eaaaa4212428cbfca1 Signed-off-by: Romain Forlot --- conf.d/cmake/config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf.d') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 81b7691..f26476b 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -126,8 +126,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:${CMAKE_BINARY_DIR}/package/var") -add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="./var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var") +add_definitions(-DCONTROL_CONFIG_PATH="./etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) add_definitions(-DUSE_API_DYN=1 -DCONTROL_SUPPORT_LUA) -- cgit 1.2.3-korg