From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 29 Jul 2015 23:13:33 +0200 Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix cross-compilation When cross-compiling, the location at build time of the libraries is not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable is here to handle this difference, so use it in kodi-config.cmake. Signed-off-by: Thomas Petazzoni --- project/cmake/kodi-config.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in index 76626ec..ffb8e1d 100644 --- a/project/cmake/kodi-config.cmake.in +++ b/project/cmake/kodi-config.cmake.in @@ -7,15 +7,15 @@ SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) ENDIF() IF(NOT @APP_NAME_UC@_INCLUDE_DIR) - SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) + SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) ENDIF() IF(NOT @APP_NAME_UC@_LIB_DIR) - SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) + SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) ENDIF() IF(NOT WIN32) SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") ENDIF() -LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@) +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON) if(NOT CORE_SYSTEM_NAME) -- 2.5.0