From 0ebfafb2b9dcfc96feaba01799a12812bd71093e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Sun, 27 Mar 2022 19:46:20 +0200 Subject: [PATCH] #3524: remove XML and Util dependencies in Zip/SevenZip --- CMakeLists.txt | 9 --------- SevenZip/CMakeLists.txt | 2 +- SevenZip/dependencies | 3 --- Zip/CMakeLists.txt | 2 +- Zip/dependencies | 4 ---- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c9ca0fef..4338befe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,10 +218,6 @@ if(ENABLE_TESTS) add_subdirectory(CppUnit) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) - - if(ENABLE_ZIP) - set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) - endif() endif() if(ENABLE_ENCODINGS_COMPILER OR ENABLE_APACHECONNECTOR) @@ -292,11 +288,6 @@ if(ENABLE_POCODOC) set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE) endif() -if(ENABLE_SEVENZIP OR ENABLE_ZIP) - set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) - set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -endif() - if(ENABLE_UTIL AND ENABLE_TESTS) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) diff --git a/SevenZip/CMakeLists.txt b/SevenZip/CMakeLists.txt index ea07537b7..96ca10721 100644 --- a/SevenZip/CMakeLists.txt +++ b/SevenZip/CMakeLists.txt @@ -62,7 +62,7 @@ set_target_properties(SevenZip DEFINE_SYMBOL SevenZip_EXPORTS ) -target_link_libraries(SevenZip PUBLIC Poco::Util Poco::XML) +target_link_libraries(SevenZip PUBLIC Poco::Foundation) target_include_directories(SevenZip PUBLIC $ diff --git a/SevenZip/dependencies b/SevenZip/dependencies index a4b61d5e9..2e8175e4e 100644 --- a/SevenZip/dependencies +++ b/SevenZip/dependencies @@ -1,4 +1 @@ Foundation -Util -XML -JSON \ No newline at end of file diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt index e89587ca5..c3a25fb41 100644 --- a/Zip/CMakeLists.txt +++ b/Zip/CMakeLists.txt @@ -21,7 +21,7 @@ set_target_properties(Zip DEFINE_SYMBOL Zip_EXPORTS ) -target_link_libraries(Zip PUBLIC Poco::Util Poco::XML) +target_link_libraries(Zip PUBLIC Poco::Foundation) target_include_directories(Zip PUBLIC $ diff --git a/Zip/dependencies b/Zip/dependencies index eb3196294..2e8175e4e 100644 --- a/Zip/dependencies +++ b/Zip/dependencies @@ -1,5 +1 @@ Foundation -Net -Util -XML -JSON \ No newline at end of file