From a047591b7d4ce81c4a77d9206d5c6ab044cefc8c Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Tue, 10 Jul 2018 22:10:43 +0200 Subject: Used right INSTALL_PREFIX variable Change-Id: Idb485fd1618b1a9bd8f7a94024a9aadbfd52a682 Signed-off-by: Sebastien Douheret --- conf.d/cmake/config.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf.d') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index c12dbe6..b3a7a84 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -126,15 +126,15 @@ set(INSTALL_PREFIX $ENV{HOME}/opt) # CACHE STRING "Compilation flags for RELEASE build type.") set(CONTROL_SUPPORT_LUA 1) -add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") -add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") +add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCTL_PLUGIN_MAGIC=1286576532) add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- -set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) +set(CMAKE_PREFIX_PATH ${INSTALL_PREFIX}/lib64/pkgconfig ${INSTALL_PREFIX}/lib/pkgconfig) +set(LD_LIBRARY_PATH ${INSTALL_PREFIX}/lib64 ${INSTALL_PREFIX}/lib) # Optional location for config.xml.in # ----------------------------------- -- cgit 1.2.3-korg