From 7825f792ef3d4d7e28a5dff9334283a61c9c75ad Mon Sep 17 00:00:00 2001 From: Nikolay Degterinsky Date: Thu, 19 Aug 2021 13:48:46 +0300 Subject: [PATCH] Improve CMake --- CMakeLists.txt | 1 - cmake/find/lz4.cmake | 27 --------------------------- src/CMakeLists.txt | 6 ++---- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 cmake/find/lz4.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c004a4a372..35c22526816 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -536,7 +536,6 @@ include (cmake/find/rocksdb.cmake) include (cmake/find/libpqxx.cmake) include (cmake/find/nuraft.cmake) include (cmake/find/yaml-cpp.cmake) -include (cmake/find/lz4.cmake) include (cmake/find/s2geometry.cmake) include (cmake/find/nlp.cmake) include (cmake/find/bzip2.cmake) diff --git a/cmake/find/lz4.cmake b/cmake/find/lz4.cmake deleted file mode 100644 index 33e91d11ede..00000000000 --- a/cmake/find/lz4.cmake +++ /dev/null @@ -1,27 +0,0 @@ -option (USE_LZ4 "Set to FALSE to use system lz4 library instead of bundled" ${NOT_UNBUNDLED}) - -if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/lz4/lib/lz4.h") - if(USE_LZ4) - message(WARNING "submodule contrib/lz4 is missing. to fix try run: \n git submodule update --init --recursive") - message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal lz4 library") - set(USE_LZ4 0) - endif() - set(MISSING_INTERNAL_LZ4_LIBRARY 1) -endif() - -if (NOT USE_LZ4) - find_library (LZ4_LIBRARY lz4) - find_path (LZ4_INCLUDE_DIR NAMES lz4.h PATHS ${LZ4_INCLUDE_PATHS}) - if (NOT LZ4_LIBRARY OR NOT LZ4_INCLUDE_DIR) - message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system lz4 library") - endif () -endif () - -if (LZ4_LIBRARY AND LZ4_INCLUDE_DIR) -elseif (NOT MISSING_INTERNAL_LZ4_LIBRARY) - set (USE_LZ4 1) - set (LZ4_LIBRARY lz4) - set (LZ4_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/lz4/lib) -endif () - -message (STATUS "Using lz4: ${LZ4_INCLUDE_DIR} : ${LZ4_LIBRARY}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 248e4956a03..0a294fc7dd5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -474,10 +474,8 @@ if (USE_DATASKETCHES) target_include_directories (clickhouse_aggregate_functions SYSTEM BEFORE PRIVATE ${DATASKETCHES_INCLUDE_DIR}) endif () -if (USE_LZ4) - target_link_libraries (clickhouse_common_io PRIVATE ${LZ4_LIBRARY}) - target_include_directories (clickhouse_common_io SYSTEM BEFORE PRIVATE ${LZ4_INCLUDE_DIR}) -endif() +target_link_libraries (clickhouse_common_io PRIVATE lz4) +target_include_directories (clickhouse_common_io SYSTEM BEFORE PRIVATE lz4) dbms_target_link_libraries(PRIVATE _boost_context)