diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ebdd35db..4ad466e9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,6 @@ include_directories(${INCLUDES} set(CMAKE_FIND_FRAMEWORK LAST) -find_package(EXPAT REQUIRED) find_package(Bento4 REQUIRED) find_package(Pugixml REQUIRED) @@ -156,9 +155,7 @@ endif() add_definitions(-DUNICODE -D_UNICODE) -include_directories(${EXPAT_INCLUDE_DIRS} - ${PUGIXML_INCLUDE_DIRS}) -list(APPEND DEPLIBS ${EXPAT_LIBRARIES}) +include_directories(${PUGIXML_INCLUDE_DIRS}) if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded) set(BENTOUSESTCFS 1) diff --git a/debian/control b/debian/control index 4c4998f92..76079ad52 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: kodi-inputstream-adaptive Priority: extra Maintainer: Team Kodi Build-Depends: debhelper (>= 9.0.0), cmake, libgtest-dev, - kodi-addon-dev, pkg-config, libexpat1-dev, - libpugixml-dev + kodi-addon-dev, pkg-config, libpugixml-dev Standards-Version: 3.9.8 Section: libs Homepage: https://kodi.tv diff --git a/depends/common/expat/CMakeLists.txt b/depends/common/expat/CMakeLists.txt deleted file mode 100644 index 271e18399..000000000 --- a/depends/common/expat/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(expat) - -include(ExternalProject) - -if(NOT WIN32 AND EXISTS "${CMAKE_SOURCE_DIR}/config.sub" AND EXISTS "${CMAKE_SOURCE_DIR}/config.guess") - message(STATUS "Copying autoconf files") - file(APPEND ${CMAKE_SOURCE_DIR}/acpatch.cmake - "file(COPY ${CMAKE_SOURCE_DIR}/config.sub ${CMAKE_SOURCE_DIR}/config.guess - DESTINATION ${CMAKE_SOURCE_DIR}/conftools/)\n") - set(CP_AUTOCONF ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/acpatch.cmake) -endif() - -externalproject_add(expat - SOURCE_DIR ${CMAKE_SOURCE_DIR} - PATCH_COMMAND ${CP_AUTOCONF} - INSTALL_COMMAND "" - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND ./configure --prefix=${OUTPUT_DIR} --disable-shared - "CFLAGS=-fPIC") - -install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff --git a/depends/common/expat/expat.sha256 b/depends/common/expat/expat.sha256 deleted file mode 100644 index 8d835da7f..000000000 --- a/depends/common/expat/expat.sha256 +++ /dev/null @@ -1 +0,0 @@ -f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237 diff --git a/depends/common/expat/expat.txt b/depends/common/expat/expat.txt deleted file mode 100644 index 6e5be5e2f..000000000 --- a/depends/common/expat/expat.txt +++ /dev/null @@ -1 +0,0 @@ -expat http://mirrors.kodi.tv/build-deps/sources/expat-2.2.9.tar.bz2 diff --git a/depends/windows/expat/expat.sha256 b/depends/windows/expat/expat.sha256 deleted file mode 100644 index 8d835da7f..000000000 --- a/depends/windows/expat/expat.sha256 +++ /dev/null @@ -1 +0,0 @@ -f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237 diff --git a/depends/windows/expat/expat.txt b/depends/windows/expat/expat.txt deleted file mode 100644 index 6e5be5e2f..000000000 --- a/depends/windows/expat/expat.txt +++ /dev/null @@ -1 +0,0 @@ -expat http://mirrors.kodi.tv/build-deps/sources/expat-2.2.9.tar.bz2 diff --git a/depends/windows/expat/flags.txt b/depends/windows/expat/flags.txt deleted file mode 100644 index 5c92e4834..000000000 --- a/depends/windows/expat/flags.txt +++ /dev/null @@ -1 +0,0 @@ --DCMAKE_DEBUG_POSTFIX:STRING= -DCMAKE_MINSIZEREL_POSTFIX:STRING= -DCMAKE_RELEASE_POSTFIX:STRING= -DCMAKE_RELWITHDEBINFO_POSTFIX:STRING= -DEXPAT_BUILD_DOCS:BOOL=OFF -DEXPAT_BUILD_EXAMPLES:BOOL=OFF -DEXPAT_BUILD_TESTS:BOOL=OFF -DEXPAT_BUILD_TOOLS:BOOL=OFF -DEXPAT_SHARED_LIBS:BOOL=OFF diff --git a/depends/windowsstore/expat/expat.sha256 b/depends/windowsstore/expat/expat.sha256 deleted file mode 100644 index 8d835da7f..000000000 --- a/depends/windowsstore/expat/expat.sha256 +++ /dev/null @@ -1 +0,0 @@ -f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237 diff --git a/depends/windowsstore/expat/expat.txt b/depends/windowsstore/expat/expat.txt deleted file mode 100644 index 6e5be5e2f..000000000 --- a/depends/windowsstore/expat/expat.txt +++ /dev/null @@ -1 +0,0 @@ -expat http://mirrors.kodi.tv/build-deps/sources/expat-2.2.9.tar.bz2 diff --git a/depends/windowsstore/expat/flags.txt b/depends/windowsstore/expat/flags.txt deleted file mode 100644 index 5c92e4834..000000000 --- a/depends/windowsstore/expat/flags.txt +++ /dev/null @@ -1 +0,0 @@ --DCMAKE_DEBUG_POSTFIX:STRING= -DCMAKE_MINSIZEREL_POSTFIX:STRING= -DCMAKE_RELEASE_POSTFIX:STRING= -DCMAKE_RELWITHDEBINFO_POSTFIX:STRING= -DEXPAT_BUILD_DOCS:BOOL=OFF -DEXPAT_BUILD_EXAMPLES:BOOL=OFF -DEXPAT_BUILD_TESTS:BOOL=OFF -DEXPAT_BUILD_TOOLS:BOOL=OFF -DEXPAT_SHARED_LIBS:BOOL=OFF diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 292e13df4..7e9b06256 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -44,7 +44,7 @@ add_executable(${BINARY} ../utils/XMLUtils.cpp ) -target_link_libraries(${BINARY} PRIVATE ${EXPAT_LIBRARIES} ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS}) +target_link_libraries(${BINARY} PRIVATE ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS}) set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/src/test/manifests") add_test(NAME manifest_tests COMMAND ${BINARY} "${TEST_DATA_DIR}")