mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-27 01:51:59 +00:00
Move miniselect
This commit is contained in:
parent
a773e7ff01
commit
2bd688402a
@ -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)
|
||||
|
@ -1,2 +0,0 @@
|
||||
set(MINISELECT_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/miniselect/include)
|
||||
message(STATUS "Using miniselect: ${MINISELECT_INCLUDE_DIR}")
|
1
contrib/CMakeLists.txt
vendored
1
contrib/CMakeLists.txt
vendored
@ -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)
|
||||
|
3
contrib/miniselect-cmake/CMakeLists.txt
Normal file
3
contrib/miniselect-cmake/CMakeLists.txt
Normal file
@ -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)
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user