| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 51cd8d5f084013360b29fe497193288ebde2f4f9 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 08/10] 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/KodiConfig.cmake.in | 5 +++-- |
| 14 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in |
| 17 | index c02a680..9d6a566 100644 |
| 18 | --- a/project/cmake/KodiConfig.cmake.in |
| 19 | +++ b/project/cmake/KodiConfig.cmake.in |
| 20 | @@ -7,10 +7,10 @@ if(NOT @APP_NAME_UC@_PREFIX) |
| 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 @APP_NAME_UC@_DATA_DIR) |
| 32 | set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@) |
| 33 | @@ -19,6 +19,7 @@ if(NOT WIN32) |
| 34 | set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") |
| 35 | endif() |
| 36 | list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) |
| 37 | +list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) |
| 38 | |
| 39 | string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") |
| 40 | add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) |
| 41 | -- |
| 42 | 2.10.2 |
| 43 | |