2017-04-29 10:37:28 +02:00
|
|
|
From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
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.
|
|
|
|
|
|
2021-03-02 08:07:01 +01:00
|
|
|
Upstream status: Reverted (PR 17616)
|
|
|
|
|
|
2017-04-29 10:37:28 +02:00
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
(rebased and simplified for Kodi 17.0-Krypton)
|
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
2021-03-02 08:07:01 +01:00
|
|
|
(rebased for Kodi 19.0-Matrix)
|
2017-04-29 10:37:28 +02:00
|
|
|
---
|
2021-03-02 08:07:01 +01:00
|
|
|
cmake/KodiConfig.cmake.in | 4 ++--
|
2017-04-29 10:37:28 +02:00
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2021-03-02 08:07:01 +01:00
|
|
|
diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in
|
|
|
|
|
index a06d889fca9d..ff299807ea44 100644
|
2020-01-19 12:07:14 +01:00
|
|
|
--- a/cmake/KodiConfig.cmake.in
|
|
|
|
|
+++ b/cmake/KodiConfig.cmake.in
|
2021-03-02 08:07:01 +01:00
|
|
|
@@ -9,7 +9,7 @@ if(NOT @APP_NAME_UC@_PREFIX)
|
2017-04-29 10:37:28 +02:00
|
|
|
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@)
|
2021-03-02 08:07:01 +01:00
|
|
|
@@ -18,7 +18,7 @@ if(NOT @APP_NAME_UC@_DATA_DIR)
|
|
|
|
|
set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
|
2017-04-29 10:37:28 +02:00
|
|
|
endif()
|
2021-03-02 08:07:01 +01:00
|
|
|
set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@)
|
2017-04-29 10:37:28 +02:00
|
|
|
-list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
|
|
|
|
|
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
|
|
|
|
|
|
|
|
|
|
string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
|
|
|
|
|
add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
|
|
|
|
|
--
|
|
|
|
|
2.5.0
|
|
|
|
|
|
