From e0655ca2d3d2db4c99d56da6fc90345e9093deb7 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sun, 16 Sep 2018 02:35:35 +0200 Subject: Fix: finding JSON file even if absolute path given Here, assuming the absolute path leads to a non existent file then only take the file name and do a research in the default search path given by environment var or pre-processor defined variables. Change-Id: Id57428141be908cda65b07f66ca59568708d3608 Signed-off-by: Romain Forlot --- conf.d/cmake/config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf.d/cmake') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 2a09704..5e0acfb 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -129,8 +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:${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="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${CMAKE_BINARY_DIR}/package-test") +add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_BINARY_DIR}/package-test/") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) add_definitions(-DAFB_BINDING_VERSION=2) -- cgit 1.2.3-korg