cmake/find_* → cmake/find/*

This commit is contained in:
Ivan Lezhankin 2019-08-30 16:28:02 +03:00
parent 6b1352f65c
commit 393bf8a804
45 changed files with 42 additions and 42 deletions

View File

@ -62,7 +62,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" AND NOT EXISTS "${ClickHouse_SOURC
message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive") message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
endif () endif ()
include (cmake/find_ccache.cmake) include (cmake/find/ccache.cmake)
if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None") if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
message (STATUS "CMAKE_BUILD_TYPE is not set, set to default = RELWITHDEBINFO") message (STATUS "CMAKE_BUILD_TYPE is not set, set to default = RELWITHDEBINFO")
@ -303,49 +303,49 @@ endif ()
message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES} UNBUNDLED=${UNBUNDLED} CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}") message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ; USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES} MAKE_STATIC_LIBRARIES=${MAKE_STATIC_LIBRARIES} SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES} UNBUNDLED=${UNBUNDLED} CCACHE=${CCACHE_FOUND} ${CCACHE_VERSION}")
include(GNUInstallDirs) include(GNUInstallDirs)
include (cmake/find_contrib_lib.cmake) include (cmake/contrib_finder.cmake)
include (cmake/lib_name.cmake) include (cmake/lib_name.cmake)
find_contrib_lib(double-conversion) # Must be before parquet find_contrib_lib(double-conversion) # Must be before parquet
include (cmake/find_ssl.cmake) include (cmake/find/ssl.cmake)
include (cmake/find_icu.cmake) include (cmake/find/icu.cmake)
include (cmake/find_boost.cmake) include (cmake/find/boost.cmake)
include (cmake/find_zlib.cmake) include (cmake/find/zlib.cmake)
include (cmake/find_zstd.cmake) include (cmake/find/zstd.cmake)
include (cmake/find_ltdl.cmake) # for odbc include (cmake/find/ltdl.cmake) # for odbc
include (cmake/find_termcap.cmake) include (cmake/find/termcap.cmake)
include (cmake/find_odbc.cmake) include (cmake/find/odbc.cmake)
# openssl, zlib, odbc before poco # openssl, zlib, odbc before poco
include (cmake/find_poco.cmake) include (cmake/find/poco.cmake)
include (cmake/find_lz4.cmake) include (cmake/find/lz4.cmake)
include (cmake/find_xxhash.cmake) include (cmake/find/xxhash.cmake)
include (cmake/find_sparsehash.cmake) include (cmake/find/sparsehash.cmake)
include (cmake/find_rt.cmake) include (cmake/find/rt.cmake)
include (cmake/find_execinfo.cmake) include (cmake/find/execinfo.cmake)
include (cmake/find_readline_edit.cmake) include (cmake/find/readline_edit.cmake)
include (cmake/find_re2.cmake) include (cmake/find/re2.cmake)
include (cmake/find_libgsasl.cmake) include (cmake/find/libgsasl.cmake)
include (cmake/find_rdkafka.cmake) include (cmake/find/rdkafka.cmake)
include (cmake/find_capnp.cmake) include (cmake/find/capnp.cmake)
include (cmake/find_llvm.cmake) include (cmake/find/llvm.cmake)
include (cmake/find_h3.cmake) include (cmake/find/h3.cmake)
include (cmake/find_cpuid.cmake) # Freebsd, bundled include (cmake/find/cpuid.cmake) # Freebsd, bundled
if (NOT USE_CPUID) if (NOT USE_CPUID)
include (cmake/find_cpuinfo.cmake) # Debian include (cmake/find/cpuinfo.cmake) # Debian
endif() endif()
include (cmake/find_libxml2.cmake) include (cmake/find/libxml2.cmake)
include (cmake/find_brotli.cmake) include (cmake/find/brotli.cmake)
include (cmake/find_protobuf.cmake) include (cmake/find/protobuf.cmake)
include (cmake/find_pdqsort.cmake) include (cmake/find/pdqsort.cmake)
include (cmake/find_hdfs3.cmake) # uses protobuf include (cmake/find/hdfs3.cmake) # uses protobuf
include (cmake/find_consistent-hashing.cmake) include (cmake/find/consistent-hashing.cmake)
include (cmake/find_base64.cmake) include (cmake/find/base64.cmake)
include (cmake/find_parquet.cmake) include (cmake/find/parquet.cmake)
include (cmake/find_hyperscan.cmake) include (cmake/find/hyperscan.cmake)
include (cmake/find_simdjson.cmake) include (cmake/find/simdjson.cmake)
include (cmake/find_rapidjson.cmake) include (cmake/find/rapidjson.cmake)
include (cmake/find_fastops.cmake) include (cmake/find/fastops.cmake)
#include (cmake/find_orc.cmake) include (cmake/find/orc.cmake)
find_contrib_lib(cityhash) find_contrib_lib(cityhash)
find_contrib_lib(farmhash) find_contrib_lib(farmhash)
@ -353,7 +353,7 @@ find_contrib_lib(metrohash)
find_contrib_lib(btrie) find_contrib_lib(btrie)
if (ENABLE_TESTS) if (ENABLE_TESTS)
include (cmake/find_gtest.cmake) include (cmake/find/gtest.cmake)
endif () endif ()
# Need to process before "contrib" dir: # Need to process before "contrib" dir:

View File

@ -30,8 +30,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
add_subdirectory(libs/libglibc-compatibility) add_subdirectory(libs/libglibc-compatibility)
include (cmake/find_unwind.cmake) include (cmake/find/unwind.cmake)
include (cmake/find_cxx.cmake) include (cmake/find/cxx.cmake)
add_library(global-group INTERFACE) add_library(global-group INTERFACE)
target_link_libraries(global-group INTERFACE target_link_libraries(global-group INTERFACE

View File

@ -21,7 +21,7 @@ endif()
if(ARROW_INCLUDE_DIR AND PARQUET_INCLUDE_DIR) if(ARROW_INCLUDE_DIR AND PARQUET_INCLUDE_DIR)
elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD) elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
include(cmake/find_snappy.cmake) include(cmake/find/snappy.cmake)
set(CAN_USE_INTERNAL_PARQUET_LIBRARY 1) set(CAN_USE_INTERNAL_PARQUET_LIBRARY 1)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
if(NOT USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY) if(NOT USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY)