Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zip and SevenZip do not depend on Util, XML, JSON #2929

Merged
merged 1 commit into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion SevenZip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions SevenZip/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
Foundation
Util
XML
JSON
2 changes: 1 addition & 1 deletion Zip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions Zip/dependencies
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
Foundation
Net
Util
XML
JSON