#3524: remove XML and Util dependencies in Zip/SevenZip

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)

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
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

SevenZip/dependencies

@@ -1,4 +1 @@
 Foundation
-Util
-XML
-JSON

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
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

Zip/dependencies

@@ -1,5 +1 @@
 Foundation
-Net
-Util
-XML
-JSON