From 240779ec7f3e8fa7f11302195fa7867c5ffc9cb4 Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Fri, 22 May 2020 14:48:34 +0000 Subject: [PATCH] Drop OpenSSL dependency ... because Debian's system GnuTLS replaces it just fine! Signed-off-by: Vasyl Gello --- CMakeLists.txt | 24 +++--------------------- debian/control | 8 +------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 158b01e..b430c67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,33 +5,15 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) find_package(Kodi REQUIRED) find_package(LibArchive REQUIRED) -find_package(LibLZMA REQUIRED) -find_package(BZip2 REQUIRED) -find_package(ZLIB REQUIRED) -find_package(LZ4 REQUIRED) -find_package(LZO2 REQUIRED) -find_package(OpenSSL REQUIRED) include_directories(${KODI_INCLUDE_DIR}/.. - ${LibArchive_INCLUDE_DIRS} - ${LIBLZMA_INCLUDE_DIRS} - ${BZIP2_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ${LZ4_INCLUDE_DIRS} - ${LZO2_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR}) + ${LibArchive_INCLUDE_DIRS}) set(ARCHIVE_SOURCES src/ArchiveFile.cpp) -set(DEPLIBS ${LibArchive_LIBRARIES} - ${LIBLZMA_LIBRARIES} - ${BZIP2_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${ZLIB_LIBRARIES} - ${LZ4_LIBRARIES} - ${LZO2_LIBRARIES}) +set(DEPLIBS ${LibArchive_LIBRARIES}) -add_definitions(-DLIBARCHIVE_STATIC -D_CRT_NONSTDC_NO_DEPRECATE) +add_definitions(-DLIBARCHIVE_SHARED -D_CRT_NONSTDC_NO_DEPRECATE) build_addon(vfs.libarchive ARCHIVE DEPLIBS) include(CPack) -- 2.20.1