package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch

   1 From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 29 Jul 2015 23:13:33 +0200
   4 Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
   5  cross-compilation
   6
   7 When cross-compiling, the location at build time of the libraries is
   8 not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
   9 is here to handle this difference, so use it in kodi-config.cmake.
  10
  11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12 ---
  13  project/cmake/kodi-config.cmake.in | 6 +++---
  14  1 file changed, 3 insertions(+), 3 deletions(-)
  15
  16 diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
  17 index 76626ec..ffb8e1d 100644
  18 --- a/project/cmake/kodi-config.cmake.in
  19 +++ b/project/cmake/kodi-config.cmake.in
  20 @@ -7,15 +7,15 @@
  21    SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
  22  ENDIF()
  23  IF(NOT @APP_NAME_UC@_INCLUDE_DIR)
  24 -  SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
  25 +  SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
  26  ENDIF()
  27  IF(NOT @APP_NAME_UC@_LIB_DIR)
  28 -  SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
  29 +  SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
  30  ENDIF()
  31  IF(NOT WIN32)
  32    SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
  33  ENDIF()
  34 -LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@)
  35 +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
  36  ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
  37
  38  if(NOT CORE_SYSTEM_NAME)
  39 --
  40 2.5.0
  41