generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 10:13:51 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Günter Obiltschnig 2022-03-27 19:46:20 +02:00
parent 852a53e702
commit 0ebfafb2b9
5 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -218,10 +218,6 @@ if(ENABLE_TESTS)
add_subdirectory(CppUnit) add_subdirectory(CppUnit)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
if(ENABLE_ZIP)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
endif()
endif() endif()
if(ENABLE_ENCODINGS_COMPILER OR ENABLE_APACHECONNECTOR) if(ENABLE_ENCODINGS_COMPILER OR ENABLE_APACHECONNECTOR)
@ -292,11 +288,6 @@ if(ENABLE_POCODOC)
set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE) set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE)
endif() 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) if(ENABLE_UTIL AND ENABLE_TESTS)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)

2
SevenZip/CMakeLists.txt
View File

@ -62,7 +62,7 @@ set_target_properties(SevenZip
DEFINE_SYMBOL SevenZip_EXPORTS DEFINE_SYMBOL SevenZip_EXPORTS
) )
target_link_libraries(SevenZip PUBLIC Poco::Util Poco::XML) target_link_libraries(SevenZip PUBLIC Poco::Foundation)
target_include_directories(SevenZip target_include_directories(SevenZip
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

3
SevenZip/dependencies
View File

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

2
Zip/CMakeLists.txt
View File

@ -21,7 +21,7 @@ set_target_properties(Zip
DEFINE_SYMBOL Zip_EXPORTS DEFINE_SYMBOL Zip_EXPORTS
) )
target_link_libraries(Zip PUBLIC Poco::Util Poco::XML) target_link_libraries(Zip PUBLIC Poco::Foundation)
target_include_directories(Zip target_include_directories(Zip
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

4
Zip/dependencies
View File

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