Merge pull request #2929 from linquize/zip

Zip and SevenZip do not depend on Util, XML, JSON
pocoproject · May 5, 2020 · daa729c · daa729c
2 parents 95d38c8 + 5568c00
commit daa729c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -274,16 +274,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)
-endif()
-
 if(ENABLE_JWT)
 	set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE)
 	set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)

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

diff --git a/SevenZip/dependencies b/SevenZip/dependencies
@@ -1,4 +1 @@
 Foundation
-Util
-XML
-JSON
diff --git 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
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

diff --git a/Zip/dependencies b/Zip/dependencies
@@ -1,5 +1 @@
 Foundation
-Net
-Util
-XML
-JSON