0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  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. When cross-compiling, the location at build time of the libraries is
  7. not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
  8. is here to handle this difference, so use it in kodi-config.cmake.
  9. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  10. ---
  11. project/cmake/KodiConfig.cmake.in | 5 +++--
  12. 1 file changed, 3 insertions(+), 2 deletions(-)
  13. diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
  14. index c02a680..9d6a566 100644
  15. --- a/project/cmake/KodiConfig.cmake.in
  16. +++ b/project/cmake/KodiConfig.cmake.in
  17. @@ -7,10 +7,10 @@ if(NOT @APP_NAME_UC@_PREFIX)
  18. set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
  19. endif()
  20. if(NOT @APP_NAME_UC@_INCLUDE_DIR)
  21. - set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
  22. + set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
  23. endif()
  24. if(NOT @APP_NAME_UC@_LIB_DIR)
  25. - set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
  26. + set(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
  27. endif()
  28. if(NOT @APP_NAME_UC@_DATA_DIR)
  29. set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
  30. @@ -19,6 +19,7 @@ if(NOT WIN32)
  31. set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
  32. endif()
  33. list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
  34. +list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
  35. string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
  36. add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
  37. --
  38. 2.10.2