LZMA/xz cannot be disabled

This commit is contained in:
Azat Khuzhin 2022-01-18 10:18:46 +03:00
parent 70b3f1de76
commit e05a75f850
2 changed files with 1 additions and 11 deletions

View File

@ -1,10 +1,3 @@
option(ENABLE_XZ "Enable xz/liblzma" ${ENABLE_LIBRARIES})
if (NOT ENABLE_XZ)
message(STATUS "Not using xz")
return()
endif()
set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/xz") set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/xz")
# Author: Lasse Collin # Author: Lasse Collin

View File

@ -390,10 +390,7 @@ dbms_target_link_libraries(PUBLIC
dbms_target_link_libraries(PRIVATE ch_contrib::zstd) dbms_target_link_libraries(PRIVATE ch_contrib::zstd)
target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::zstd) target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::zstd)
if (TARGET ch_contrib::xz)
target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::xz) target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::xz)
endif()
if (TARGET ch_contrib::icu) if (TARGET ch_contrib::icu)
dbms_target_link_libraries (PRIVATE ch_contrib::icu) dbms_target_link_libraries (PRIVATE ch_contrib::icu)