From d4742fd470fb160bd6bff4f9364a5b826d4a5367 Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Wed, 5 Dec 2018 00:03:44 +0100 Subject: [PATCH] Remove unneded link-time dependency on libz and libexpat --- libgrive/CMakeLists.txt | 7 ------- libgrive/src/xml/TreeBuilder.cc | 1 - 2 files changed, 8 deletions(-) diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index d9dbebb..c7ad3cb 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -4,12 +4,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") find_package(LibGcrypt REQUIRED) find_package(CURL REQUIRED) -find_package(EXPAT REQUIRED) find_package(Boost 1.40.0 COMPONENTS program_options filesystem unit_test_framework regex system REQUIRED) find_package(BFD) find_package(CppUnit) find_package(Iberty) -find_package(ZLIB) find_package(PkgConfig) pkg_check_modules(YAJL REQUIRED yajl) @@ -37,10 +35,6 @@ else ( IBERTY_FOUND ) set( IBERTY_LIBRARY "" ) endif ( IBERTY_FOUND ) -if ( ZLIB_FOUND ) - set( OPT_LIBS ${OPT_LIBS} ${ZLIB_LIBRARIES} ) -endif ( ZLIB_FOUND ) - include_directories( ${libgrive_SOURCE_DIR}/src ${libgrive_SOURCE_DIR}/test @@ -88,7 +82,6 @@ target_link_libraries( grive ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${IBERTY_LIBRARY} - ${EXPAT_LIBRARY} ${OPT_LIBS} ) diff --git a/libgrive/src/xml/TreeBuilder.cc b/libgrive/src/xml/TreeBuilder.cc index 9d57501..1414255 100644 --- a/libgrive/src/xml/TreeBuilder.cc +++ b/libgrive/src/xml/TreeBuilder.cc @@ -23,7 +23,6 @@ #include "Node.hh" #include "util/log/Log.hh" -#include #include #include