jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi-platform: fix generated kodiplatform-config.cmake

Browse Source
This commit is contained in:
Jonas Karlman 2017-01-03 21:20:57 +01:00
parent b7802b8840
commit 8c6eeda661
3 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi-platform/package.mk
View File

@ -31,8 +31,8 @@ PKG_LONGDESC="kodi-platform:"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR:STRING=lib \
-DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \
-DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
-DBUILD_SHARED_LIBS=0"

19
packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch
View File

@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2765341..1bd4fc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ else()
@@ -22,7 +22,7 @@
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 ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX_TOOLCHAIN}/include/kodi")
+set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
IF(WIN32)
LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows")
ENDIF(WIN32)
@ -15,12 +15,23 @@ diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in
index 3fc5273..60bdf1b 100644
--- a/kodiplatform-config.cmake.in
+++ b/kodiplatform-config.cmake.in
@@ -10,7 +10,7 @@
@@ -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 @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include)
+set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include/kodi)
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_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib")
else(WIN32)
- set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
+ set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX_TOOLCHAIN@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform")
endif(WIN32)
set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@")
mark_as_advanced (kodiplatform_LIBRARY)

37
packages/mediacenter/kodi-platform/patches/kodi-platform-02_no-multi-lib.patch
View File

@ -1,37 +0,0 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2016-01-06 00:56:44.616186365 +0100
+++ b/CMakeLists.txt 2016-01-06 00:59:03.502490684 +0100
@@ -9,7 +9,6 @@
find_package(TinyXML REQUIRED)
find_package(Threads REQUIRED)
find_package(p8-platform REQUIRED)
-include(UseMultiArch.cmake)
include(CheckAtomic.cmake)
set(kodiplatform_NAME kodiplatform)
@@ -43,7 +42,7 @@
set_target_properties(kodiplatform PROPERTIES VERSION ${kodiplatform_VERSION_MAJOR}.${kodiplatform_VERSION_MINOR}.${kodiplatform_VERSION_PATCH}
SOVERSION ${kodiplatform_VERSION_MAJOR}.0)
-install(TARGETS kodiplatform DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS kodiplatform DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
install(FILES src/util/XMLUtils.h
DESTINATION include/kodi/util)
@@ -57,14 +56,14 @@
${CMAKE_INSTALL_PREFIX}/include)
install(FILES ${CMAKE_BINARY_DIR}/kodiplatform.pc
- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
ENDIF(NOT WIN32)
# config mode
configure_file (kodiplatform-config.cmake.in
kodiplatform-config.cmake @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/kodiplatform-config.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/kodiplatform)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/kodiplatform)
# Quell warnings with in-tree builds
set(KODI_BUILD_DIR ${KODI_BUILD_DIR})