0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  3. Date: Thu, 30 Jul 2015 09:28:24 +0200
  4. Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation
  5. Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make
  6. it cross-compilation friendly.
  7. Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30
  8. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  9. ---
  10. CMakeLists.txt | 2 +-
  11. kodiplatform-config.cmake.in | 6 +++---
  12. 2 files changed, 4 insertions(+), 4 deletions(-)
  13. diff --git a/CMakeLists.txt b/CMakeLists.txt
  14. index 25d8004..db23dc9 100644
  15. --- a/CMakeLists.txt
  16. +++ b/CMakeLists.txt
  17. @@ -22,7 +22,7 @@ if(NOT WIN32)
  18. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
  19. endif()
  20. -set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi")
  21. +set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi")
  22. IF(WIN32)
  23. LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows")
  24. ENDIF(WIN32)
  25. diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in
  26. index 3fc5273..1bc437a 100644
  27. --- a/kodiplatform-config.cmake.in
  28. +++ b/kodiplatform-config.cmake.in
  29. @@ -10,16 +10,16 @@
  30. #
  31. # propagate these properties from one build system to the other
  32. set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@")
  33. -set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
  34. +set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include)
  35. set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
  36. set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@")
  37. set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@")
  38. # libraries come from the build tree where this file was generated
  39. if(WIN32)
  40. - set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib")
  41. + set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib")
  42. else(WIN32)
  43. - set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
  44. + set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
  45. endif(WIN32)
  46. set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@")
  47. mark_as_advanced (kodiplatform_LIBRARY)
  48. --
  49. 2.5.0