1*4882a593SmuzhiyunFrom 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Wed, 29 Jul 2015 23:13:33 +0200 4*4882a593SmuzhiyunSubject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix 5*4882a593Smuzhiyun cross-compilation 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunWhen cross-compiling, the location at build time of the libraries is 8*4882a593Smuzhiyunnot the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable 9*4882a593Smuzhiyunis here to handle this difference, so use it in kodi-config.cmake. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream status: Reverted (PR 17616) 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 14*4882a593Smuzhiyun(rebased and simplified for Kodi 17.0-Krypton) 15*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 16*4882a593Smuzhiyun(rebased for Kodi 19.0-Matrix) 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun cmake/KodiConfig.cmake.in | 4 ++-- 19*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in 22*4882a593Smuzhiyunindex a06d889fca9d..ff299807ea44 100644 23*4882a593Smuzhiyun--- a/cmake/KodiConfig.cmake.in 24*4882a593Smuzhiyun+++ b/cmake/KodiConfig.cmake.in 25*4882a593Smuzhiyun@@ -9,7 +9,7 @@ if(NOT @APP_NAME_UC@_PREFIX) 26*4882a593Smuzhiyun set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) 27*4882a593Smuzhiyun endif() 28*4882a593Smuzhiyun if(NOT @APP_NAME_UC@_INCLUDE_DIR) 29*4882a593Smuzhiyun- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) 30*4882a593Smuzhiyun+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) 31*4882a593Smuzhiyun endif() 32*4882a593Smuzhiyun if(NOT @APP_NAME_UC@_LIB_DIR) 33*4882a593Smuzhiyun set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) 34*4882a593Smuzhiyun@@ -18,7 +18,7 @@ if(NOT @APP_NAME_UC@_DATA_DIR) 35*4882a593Smuzhiyun set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@) 36*4882a593Smuzhiyun endif() 37*4882a593Smuzhiyun set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@) 38*4882a593Smuzhiyun-list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) 39*4882a593Smuzhiyun+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") 42*4882a593Smuzhiyun add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.5.0 45*4882a593Smuzhiyun 46