[SCM] kodiplatform/master: Merge pull request #15 from Memphiz/tvos

[rbalint at users.alioth.debian.org]

[tvos] - remove iokit linkage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 05f3f66fa5c4ac15c50903f1e03563ad614156f7
X-Git-Newrev: 4c315d947dee64b79971ff3b57edbbea08fce838

The following commit has been merged in the master branch:
commit fed924e764b4c9c722f7f5d825ce70d4b61ae54f
Merge: b6a510892bb4cec810e3820afb844167d74560ad 7f1f71349ac25f9e03a3b50ea6ee225e1414eab8
Author: Lars Op den Kamp <opdenkamp at gmail.com>
Date:   Tue Jan 19 21:18:55 2016 +0100

    Merge pull request #15 from Memphiz/tvos
    
    [tvos] - remove iokit linkage

diff --combined CMakeLists.txt
index bf6b659,d0135ca..466de6a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -8,7 -8,7 +8,7 @@@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PA
  find_package(kodi REQUIRED)
  find_package(TinyXML REQUIRED)
  find_package(Threads REQUIRED)
 -find_package(platform REQUIRED)
 +find_package(p8-platform REQUIRED)
  include(UseMultiArch.cmake)
  include(CheckAtomic.cmake)
  
@@@ -30,16 -30,16 +30,16 @@@ set(kodiplatform_LIBRARIES ${CMAKE_THRE
  
  if(NOT ${CORE_SYSTEM_NAME} STREQUAL "")
    if(${CORE_SYSTEM_NAME} STREQUAL "osx" OR ${CORE_SYSTEM_NAME} STREQUAL "ios")
-     list(APPEND kodiplatform_LIBRARIES "-framework CoreVideo -framework IOKit")
+     list(APPEND kodiplatform_LIBRARIES "-framework CoreVideo")
    endif()
  endif()
  
  set(SOURCES src/util/XMLUtils.cpp)
  
 -include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${platform_INCLUDE_DIRS})
 +include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${p8-platform_INCLUDE_DIRS})
  
  add_library(kodiplatform ${SOURCES} ${PLAT_SOURCES})
 -target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${platform_LIBRARIES})
 +target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${p8-platform_LIBRARIES})
  set_target_properties(kodiplatform PROPERTIES VERSION ${kodiplatform_VERSION_MAJOR}.${kodiplatform_VERSION_MINOR}.${kodiplatform_VERSION_PATCH}
                                                SOVERSION ${kodiplatform_VERSION_MAJOR}.0)
  

-- 
kodiplatform packaging