From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 30 Jul 2015 09:28:24 +0200 Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make it cross-compilation friendly. Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30 Signed-off-by: Thomas Petazzoni --- CMakeLists.txt | 2 +- kodiplatform-config.cmake.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d8004..db23dc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ if(NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") endif() -set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") +set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi") IF(WIN32) LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows") ENDIF(WIN32) diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in index 3fc5273..1bc437a 100644 --- a/kodiplatform-config.cmake.in +++ b/kodiplatform-config.cmake.in @@ -10,16 +10,16 @@ # # propagate these properties from one build system to the other set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@") -set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) +set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include) set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@") set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@") # libraries come from the build tree where this file was generated if(WIN32) - set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") + set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") else(WIN32) - set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") + set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") endif(WIN32) set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@") mark_as_advanced (kodiplatform_LIBRARY) -- 2.5.0