From 2bd688402a69c1c92ba0d6812fe46475f436850f Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Tue, 18 Jan 2022 00:34:07 +0300 Subject: [PATCH] Move miniselect --- CMakeLists.txt | 1 - cmake/find/miniselect.cmake | 2 -- contrib/CMakeLists.txt | 1 + contrib/miniselect-cmake/CMakeLists.txt | 3 +++ src/CMakeLists.txt | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 cmake/find/miniselect.cmake create mode 100644 contrib/miniselect-cmake/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 6897aace9e1..4e576c46bb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -492,7 +492,6 @@ include (cmake/find/cyrus-sasl.cmake) include (cmake/find/llvm.cmake) include (cmake/find/libxml2.cmake) include (cmake/find/pdqsort.cmake) -include (cmake/find/miniselect.cmake) include (cmake/find/curl.cmake) include (cmake/find/s3.cmake) include (cmake/find/nlp.cmake) diff --git a/cmake/find/miniselect.cmake b/cmake/find/miniselect.cmake deleted file mode 100644 index 0a50c9bf4a8..00000000000 --- a/cmake/find/miniselect.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(MINISELECT_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/miniselect/include) -message(STATUS "Using miniselect: ${MINISELECT_INCLUDE_DIR}") diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index b44f430fac3..11c13d35770 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -21,6 +21,7 @@ endif() set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1) +add_subdirectory (miniselect-cmake) add_subdirectory (sparsehash-c11-cmake) add_subdirectory (abseil-cpp-cmake) add_subdirectory (magic-enum-cmake) diff --git a/contrib/miniselect-cmake/CMakeLists.txt b/contrib/miniselect-cmake/CMakeLists.txt new file mode 100644 index 00000000000..f6dda7a1474 --- /dev/null +++ b/contrib/miniselect-cmake/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(_miniselect INTERFACE) +target_include_directories(_miniselect BEFORE INTERFACE ${ClickHouse_SOURCE_DIR}/contrib/miniselect/include) +add_library(ch_contrib::miniselect ALIAS _miniselect) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 17b6bf85056..10d95dd30f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -380,8 +380,8 @@ dbms_target_include_directories(PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include target_include_directories(clickhouse_common_io SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR}) dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR}) -target_include_directories(clickhouse_common_io SYSTEM BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR}) -dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR}) +target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::miniselect) +dbms_target_link_libraries(PUBLIC ch_contrib::miniselect) dbms_target_link_libraries(PRIVATE ch_contrib::zstd) target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::zstd)