Revert "cmake: Add option to fail configuration instead of auto-reconfiguration"

CMakeLists.txt

@@ -28,14 +28,6 @@ endforeach()
 
 project(ClickHouse)
 
-option(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
-      "Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF) but is not possible to satisfy" OFF)
-if(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION)
-    set(RECONFIGURE_MESSAGE_LEVEL FATAL_ERROR)
-else()
-    set(RECONFIGURE_MESSAGE_LEVEL STATUS)
-endif()
-
 include (cmake/arch.cmake)
 include (cmake/target.cmake)
 include (cmake/tools.cmake)
@@ -65,7 +57,7 @@ if(ENABLE_IPO)
         message(STATUS "IPO/LTO is supported, enabling")
         set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
     else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "IPO/LTO is not supported: <${IPO_NOT_SUPPORTED}>")
+        message(STATUS "IPO/LTO is not supported: <${IPO_NOT_SUPPORTED}>")
     endif()
 else()
     message(STATUS "IPO/LTO not enabled.")
@@ -141,8 +133,6 @@ option (ENABLE_TESTS "Enables tests" ON)
 
 if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
     option (GLIBC_COMPATIBILITY "Set to TRUE to enable compatibility with older glibc libraries. Only for x86_64, Linux. Implies ENABLE_FASTMEMCPY." ON)
-elseif(GLIBC_COMPATIBILITY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
 endif ()
 
 if (NOT CMAKE_VERSION VERSION_GREATER "3.9.0")
@@ -266,8 +256,6 @@ if (COMPILER_CLANG)
         set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -flto=thin")
         set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -flto=thin")
         set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -flto=thin")
-    elseif (ENABLE_THINLTO)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable ThinLTO")
     endif ()
 
     # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled

cmake/analysis.cmake

@@ -12,9 +12,7 @@ if (ENABLE_CLANG_TIDY)
         set (USE_CLANG_TIDY 1)
         # The variable CMAKE_CXX_CLANG_TIDY will be set inside src and base directories with non third-party code.
         # set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
-    elseif (FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION)
-        message(FATAL_ERROR "clang-tidy is not found")
     else ()
-        message(STATUS "clang-tidy is not found. This is normal - the tool is only used for static code analysis and isn't essential for the build.")
+        message(STATUS "clang-tidy is not found. This is normal - the tool is used only for static code analysis and not essential for build.")
     endif ()
 endif ()

cmake/contrib_finder.cmake

@@ -8,9 +8,6 @@ macro(find_contrib_lib LIB_NAME)
 
     if (NOT USE_INTERNAL_${LIB_NAME_UC}_LIBRARY)
         find_package ("${LIB_NAME}")
-        if (NOT ${LIB_NAME_UC}_FOUND)
-            message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use system ${LIB_NAME}")
-        endif()
     endif ()
 
     if (NOT ${LIB_NAME_UC}_FOUND)
@@ -20,4 +17,5 @@ macro(find_contrib_lib LIB_NAME)
     endif ()
 
     message (STATUS "Using ${LIB_NAME}: ${${LIB_NAME_UC}_INCLUDE_DIR} : ${${LIB_NAME_UC}_LIBRARIES}")
+
 endmacro()

cmake/find/amqpcpp.cmake

@@ -1,22 +1,21 @@
 option(ENABLE_AMQPCPP "Enalbe AMQP-CPP" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_AMQPCPP)
-    return()
-endif()
-
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/CMakeLists.txt")
     message (WARNING "submodule contrib/AMQP-CPP is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal AMQP-CPP library")
+    set (ENABLE_AMQPCPP 0)
-    set (USE_AMQPCPP 0)
-    return()
 endif ()
 
-set (USE_AMQPCPP 1)
+if (ENABLE_AMQPCPP)
-set (AMQPCPP_LIBRARY AMQP-CPP)
 
-set (AMQPCPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include")
+    set (USE_AMQPCPP 1)
-list (APPEND AMQPCPP_INCLUDE_DIR
+    set (AMQPCPP_LIBRARY AMQP-CPP)
-        "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include"
+
-        "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
+    set (AMQPCPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include")
+
+    list (APPEND AMQPCPP_INCLUDE_DIR
+            "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include"
+            "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
+
+endif()
 
 message (STATUS "Using AMQP-CPP=${USE_AMQPCPP}: ${AMQPCPP_INCLUDE_DIR} : ${AMQPCPP_LIBRARY}")

cmake/find/avro.cmake

@@ -1,34 +1,28 @@
 option (ENABLE_AVRO "Enable Avro" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_AVRO)
+if (ENABLE_AVRO)
-    if (USE_INTERNAL_AVRO_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal avro library with ENABLE_AVRO=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_AVRO_LIBRARY "Set to FALSE to use system avro library instead of bundled" ${NOT_UNBUNDLED})
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/avro/lang/c++/CMakeLists.txt")
+if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/avro/lang/c++/CMakeLists.txt")
-    if (USE_INTERNAL_AVRO_LIBRARY)
+    if(USE_INTERNAL_AVRO_LIBRARY)
         message(WARNING "submodule contrib/avro is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot find internal avro")
-        set(USE_INTERNAL_AVRO_LIBRARY 0)
     endif()
     set(MISSING_INTERNAL_AVRO_LIBRARY 1)
+    set(USE_INTERNAL_AVRO_LIBRARY 0)
 endif()
 
 if (NOT USE_INTERNAL_AVRO_LIBRARY)
-   message (${RECONFIGURE_MESSAGE_LEVEL} "Using system avro library is not supported yet")
 elseif(NOT MISSING_INTERNAL_AVRO_LIBRARY)
     include(cmake/find/snappy.cmake)
     set(AVROCPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/avro/lang/c++/include")
     set(AVROCPP_LIBRARY avrocpp)
-    set(USE_INTERNAL_AVRO_LIBRARY 1)
 endif ()
 
 if (AVROCPP_LIBRARY AND AVROCPP_INCLUDE_DIR)
     set(USE_AVRO 1)
 endif()
 
+endif()
+
 message (STATUS "Using avro=${USE_AVRO}: ${AVROCPP_INCLUDE_DIR} : ${AVROCPP_LIBRARY}")

cmake/find/base64.cmake

@@ -1,21 +1,17 @@
-option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_BASE64)
-    return()
-endif()
-
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64/LICENSE")
     set (MISSING_INTERNAL_BASE64_LIBRARY 1)
     message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
 endif ()
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64")
+if (NOT MISSING_INTERNAL_BASE64_LIBRARY)
-    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
+    option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
-else()
+endif ()
-    set (BASE64_LIBRARY base64)
-    set (USE_BASE64 1)
-endif()
 
-if (NOT USE_BASE64)
+if (ENABLE_BASE64)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable base64")
+    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64")
-endif()
+        message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
+    else()
+        set (BASE64_LIBRARY base64)
+        set (USE_BASE64 1)
+    endif()
+endif ()

cmake/find/brotli.cmake

@@ -1,18 +1,12 @@
 option (ENABLE_BROTLI "Enable brotli" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_BROTLI)
+if (ENABLE_BROTLI)
-    if (USE_INTERNAL_BROTLI_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal brotly library with ENABLE_BROTLI=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_BROTLI_LIBRARY "Set to FALSE to use system libbrotli library instead of bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include/brotli/decode.h")
     if (USE_INTERNAL_BROTLI_LIBRARY)
         message (WARNING "submodule contrib/brotli is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot find internal brotli")
         set (USE_INTERNAL_BROTLI_LIBRARY 0)
     endif ()
     set (MISSING_INTERNAL_BROTLI_LIBRARY 1)
@@ -25,18 +19,18 @@ if(NOT USE_INTERNAL_BROTLI_LIBRARY)
     find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h brotli/encode.h brotli/port.h brotli/types.h PATHS ${BROTLI_INCLUDE_PATHS})
     if(BROTLI_LIBRARY_DEC AND BROTLI_LIBRARY_ENC AND BROTLI_LIBRARY_COMMON)
         set(BROTLI_LIBRARY ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_COMMON})
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use system brotli")
     endif()
 endif()
 
 if (BROTLI_LIBRARY AND BROTLI_INCLUDE_DIR)
     set (USE_BROTLI 1)
 elseif (NOT MISSING_INTERNAL_BROTLI_LIBRARY)
-    set (BROTLI_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include")
+    set (BROTLI_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include)
     set (USE_INTERNAL_BROTLI_LIBRARY 1)
     set (BROTLI_LIBRARY brotli)
     set (USE_BROTLI 1)
 endif ()
 
+endif()
+
 message (STATUS "Using brotli=${USE_BROTLI}: ${BROTLI_INCLUDE_DIR} : ${BROTLI_LIBRARY}")

cmake/find/capnp.cmake

@@ -1,21 +1,15 @@
 option (ENABLE_CAPNP "Enable Cap'n Proto" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_CAPNP)
+if (ENABLE_CAPNP)
-    if (USE_INTERNAL_CAPNP_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal capnproto library with ENABLE_CAPNP=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_CAPNP_LIBRARY "Set to FALSE to use system capnproto library instead of bundled" ${NOT_UNBUNDLED})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/capnproto/CMakeLists.txt")
     if(USE_INTERNAL_CAPNP_LIBRARY)
         message(WARNING "submodule contrib/capnproto is missing. to fix try run: \n git submodule update --init --recursive")
-        message(${RECONFIGURE_MESSAGE_LEVEL} "cannot find internal capnproto")
-        set(USE_INTERNAL_CAPNP_LIBRARY 0)
     endif()
     set(MISSING_INTERNAL_CAPNP_LIBRARY 1)
+    set(USE_INTERNAL_CAPNP_LIBRARY 0)
 endif()
 
 # FIXME: refactor to use `add_library(… IMPORTED)` if possible.
@@ -24,21 +18,17 @@ if (NOT USE_INTERNAL_CAPNP_LIBRARY)
     find_library (CAPNP capnp)
     find_library (CAPNPC capnpc)
 
-    if(KJ AND CAPNP AND CAPNPC)
+    set (CAPNP_LIBRARIES ${CAPNPC} ${CAPNP} ${KJ})
-        set (CAPNP_LIBRARIES ${CAPNPC} ${CAPNP} ${KJ})
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system capnproto")
-    endif()
-endif()
-
-if (CAPNP_LIBRARIES)
-    set (USE_CAPNP 1)
 elseif(NOT MISSING_INTERNAL_CAPNP_LIBRARY)
     add_subdirectory(contrib/capnproto-cmake)
 
     set (CAPNP_LIBRARIES capnpc)
+endif ()
+
+if (CAPNP_LIBRARIES)
     set (USE_CAPNP 1)
-    set (USE_INTERNAL_CAPNP_LIBRARY 1)
+endif ()
+
 endif ()
 
 message (STATUS "Using capnp=${USE_CAPNP}: ${CAPNP_LIBRARIES}")

cmake/find/cassandra.cmake

@@ -1,29 +1,25 @@
 option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_CASSANDRA)
+if (ENABLE_CASSANDRA)
-    return()
+    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-endif()
+        message (ERROR "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
-
+    elseif (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
+        message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init --recursive")
-    message (ERROR "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libuv needed for Cassandra")
-elseif (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
-    message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal Cassandra")
-else()
-    set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-    set (CASSANDRA_INCLUDE_DIR
-            "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
-    if (MAKE_STATIC_LIBRARIES)
-        set (LIBUV_LIBRARY uv_a)
-        set (CASSANDRA_LIBRARY cassandra_static)
     else()
-        set (LIBUV_LIBRARY uv)
+        set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-        set (CASSANDRA_LIBRARY cassandra)
+        set (CASSANDRA_INCLUDE_DIR
-    endif()
+                "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
+        if (USE_STATIC_LIBRARIES)
+            set (LIBUV_LIBRARY uv_a)
+            set (CASSANDRA_LIBRARY cassandra_static)
+        else()
+            set (LIBUV_LIBRARY uv)
+            set (CASSANDRA_LIBRARY cassandra)
+        endif()
+        set (USE_CASSANDRA 1)
+        set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
 
-    set (USE_CASSANDRA 1)
+    endif()
-    set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
 endif()
 
 message (STATUS "Using cassandra=${USE_CASSANDRA}: ${CASSANDRA_INCLUDE_DIR} : ${CASSANDRA_LIBRARY}")

cmake/find/ccache.cmake

@@ -1,9 +1,3 @@
-option(ENABLE_CCACHE "Speedup re-compilations using ccache" ON)
-
-if (NOT ENABLE_CCACHE)
-    return()
-endif()
-
 find_program (CCACHE_FOUND ccache)
 
 if (CCACHE_FOUND AND NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" AND NOT CMAKE_CXX_COMPILER MATCHES "ccache")
@@ -15,8 +9,6 @@ if (CCACHE_FOUND AND NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache" AND NOT CM
       set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
       set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
    else ()
-      message(${RECONFIGURE_MESSAGE_LEVEL} "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
+      message(STATUS "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
    endif ()
-elseif (NOT CCACHE_FOUND)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use ccache")
 endif ()

cmake/find/cxx.cmake

@@ -1,68 +1,41 @@
-option (USE_LIBCXX "Use libc++ and libc++abi instead of libstdc++" ${NOT_UNBUNDLED})
-
-if (NOT USE_LIBCXX)
-    if (USE_INTERNAL_LIBCXX_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal libcxx with USE_LIBCXX=OFF")
-    endif()
-    target_link_libraries(global-libs INTERFACE -l:libstdc++.a -l:libstdc++fs.a) # Always link these libraries as static
-    target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
-    return()
-endif()
-
 set(USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT ${NOT_UNBUNDLED})
-option (USE_INTERNAL_LIBCXX_LIBRARY "Set to FALSE to use system libcxx and libcxxabi libraries instead of bundled" ${USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libcxx/CMakeLists.txt")
-    if (USE_INTERNAL_LIBCXX_LIBRARY)
+    message(WARNING "submodule contrib/libcxx is missing. to fix try run: \n git submodule update --init --recursive")
-        message(WARNING "submodule contrib/libcxx is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libcxx")
-        set(USE_INTERNAL_LIBCXX_LIBRARY 0)
-    endif()
     set(USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT 0)
-    set(MISSING_INTERNAL_LIBCXX_LIBRARY 1)
 endif()
 
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_LIBCPP_DEBUG=0") # More checks in debug build.
+option (USE_LIBCXX "Use libc++ and libc++abi instead of libstdc++" ${NOT_UNBUNDLED})
+option (USE_INTERNAL_LIBCXX_LIBRARY "Set to FALSE to use system libcxx and libcxxabi libraries instead of bundled" ${USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT})
 
-if (NOT USE_INTERNAL_LIBCXX_LIBRARY)
+if (USE_LIBCXX)
-    find_library (LIBCXX_LIBRARY c++)
+    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_LIBCPP_DEBUG=0") # More checks in debug build.
-    find_library (LIBCXXFS_LIBRARY c++fs)
-    find_library (LIBCXXABI_LIBRARY c++abi)
 
-    if(LIBCXX_LIBRARY AND LIBCXXABI_LIBRARY) # c++fs is now a part of the libc++
+    if (NOT USE_INTERNAL_LIBCXX_LIBRARY)
-        set (HAVE_LIBCXX 1)
+        find_library (LIBCXX_LIBRARY c++)
+        find_library (LIBCXXFS_LIBRARY c++fs)
+        find_library (LIBCXXABI_LIBRARY c++abi)
+
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+
+        target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
     else ()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system libcxx")
+        set (LIBCXX_LIBRARY cxx)
-    endif()
+        set (LIBCXXABI_LIBRARY cxxabi)
+        add_subdirectory(contrib/libcxxabi-cmake)
+        add_subdirectory(contrib/libcxx-cmake)
 
-    if(NOT LIBCXXFS_LIBRARY)
+        # Exception handling library is embedded into libcxxabi.
-        set(LIBCXXFS_LIBRARY ${LIBCXX_LIBRARY})
+    endif ()
-    endif()
 
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    target_link_libraries(global-libs INTERFACE ${LIBCXX_LIBRARY} ${LIBCXXABI_LIBRARY} ${LIBCXXFS_LIBRARY})
-
-    target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
-endif ()
-
-if (NOT HAVE_LIBCXX AND NOT MISSING_INTERNAL_LIBCXX_LIBRARY)
-    set (LIBCXX_LIBRARY cxx)
-    set (LIBCXXABI_LIBRARY cxxabi)
-    add_subdirectory(contrib/libcxxabi-cmake)
-    add_subdirectory(contrib/libcxx-cmake)
-
-    # Exception handling library is embedded into libcxxabi.
 
     set (HAVE_LIBCXX 1)
-    set(USE_INTERNAL_LIBCXX_LIBRARY 1)
-endif ()
-
-if (HAVE_LIBCXX)
-    target_link_libraries(global-libs INTERFACE ${LIBCXX_LIBRARY} ${LIBCXXABI_LIBRARY} ${LIBCXXFS_LIBRARY})
 
     message (STATUS "Using libcxx: ${LIBCXX_LIBRARY}")
     message (STATUS "Using libcxxfs: ${LIBCXXFS_LIBRARY}")
     message (STATUS "Using libcxxabi: ${LIBCXXABI_LIBRARY}")
-else()
+else ()
     target_link_libraries(global-libs INTERFACE -l:libstdc++.a -l:libstdc++fs.a) # Always link these libraries as static
     target_link_libraries(global-libs INTERFACE ${EXCEPTION_HANDLING_LIBRARY})
-endif()
+endif ()

cmake/find/fastops.cmake

@@ -1,24 +1,19 @@
 if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT OS_DARWIN)
     option(ENABLE_FASTOPS "Enable fast vectorized mathematical functions library by Mikhail Parakhin" ${ENABLE_LIBRARIES})
-elseif(ENABLE_FASTOPS)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Fastops library is not supported on ARM, FreeBSD and Darwin")
 endif()
 
-if(NOT ENABLE_FASTOPS)
+if(ENABLE_FASTOPS)
+    if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/fastops/fastops/fastops.h")
+        message(WARNING "submodule contrib/fastops is missing. to fix try run: \n git submodule update --init --recursive")
+        set(MISSING_INTERNAL_FASTOPS_LIBRARY 1)
+    endif()
+    if(NOT MISSING_INTERNAL_FASTOPS_LIBRARY)
+        set(USE_FASTOPS 1)
+        set(FASTOPS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/fastops/)
+        set(FASTOPS_LIBRARY fastops)
+    endif()
+else()
     set(USE_FASTOPS 0)
-    return()
-endif()
-
-if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/fastops/fastops/fastops.h")
-    message(WARNING "submodule contrib/fastops is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal fastops library")
-    set(MISSING_INTERNAL_FASTOPS_LIBRARY 1)
-endif()
-
-if(NOT MISSING_INTERNAL_FASTOPS_LIBRARY)
-    set(USE_FASTOPS 1)
-    set(FASTOPS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/fastops/)
-    set(FASTOPS_LIBRARY fastops)
 endif()
 
 message(STATUS "Using fastops=${USE_FASTOPS}: ${FASTOPS_INCLUDE_DIR} : ${FASTOPS_LIBRARY}")

cmake/find/gperf.cmake

@@ -1,11 +1,8 @@
-if(NOT DEFINED ENABLE_GPERF OR ENABLE_GPERF)
+# Check if gperf was installed
-    # Check if gperf was installed
+find_program(GPERF gperf)
-    find_program(GPERF gperf)
+if(GPERF)
-    if(GPERF)
+    option(ENABLE_GPERF "Use gperf function hash generator tool" ${ENABLE_LIBRARIES})
-        option(ENABLE_GPERF "Use gperf function hash generator tool" ${ENABLE_LIBRARIES})
-    endif()
 endif()
-
 if (ENABLE_GPERF)
     if(NOT GPERF)
         message(FATAL_ERROR "Could not find the program gperf")

cmake/find/grpc.cmake

@@ -1,38 +1,26 @@
 option (ENABLE_GRPC "Use gRPC" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_GRPC)
+if (ENABLE_GRPC)
+    option (USE_INTERNAL_GRPC_LIBRARY "Set to FALSE to use system gRPC library instead of bundled" ${NOT_UNBUNDLED})
+
     if (USE_INTERNAL_GRPC_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal gRPC library with ENABLE_GRPC=OFF")
+        if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/grpc/include/grpc++/grpc++.h")
-    endif()
+            message(WARNING "submodule contrib/grpc is missing. To fix try run: \n git submodule update --init --recursive")
-    return()
+            set (USE_INTERNAL_GRPC_LIBRARY OFF)
-endif()
+        elif (NOT USE_PROTOBUF)
-
+            message(WARNING "gRPC requires protobuf which is disabled")
-option (USE_INTERNAL_GRPC_LIBRARY "Set to FALSE to use system gRPC library instead of bundled" ${NOT_UNBUNDLED})
+            set (USE_INTERNAL_GRPC_LIBRARY OFF)
-
+        else()
-if (NOT USE_INTERNAL_GRPC_LIBRARY)
+            set (GRPC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc/include")
-    find_package(grpc)
+            set (GRPC_LIBRARY "libgrpc++")
-    if (GRPC_INCLUDE_DIR AND GRPC_LIBRARY)
+            set (USE_GRPC ON)
-        set (USE_GRPC ON)
+        endif()
     else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system gRPC")
+        find_package(grpc)
+        if (GRPC_INCLUDE_DIR AND GRPC_LIBRARY)
+            set (USE_GRPC ON)
+        endif()
     endif()
 endif()
 
-if (NOT USE_GRPC)
+message(STATUS "Using gRPC=${USE_GRPC}: ${GRPC_INCLUDE_DIR} : ${GRPC_LIBRARY}")
-    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/grpc/include/grpc++/grpc++.h")
-        message (WARNING "submodule contrib/grpc is missing. To fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal gRPC")
-        set (USE_INTERNAL_GRPC_LIBRARY OFF)
-    elseif (NOT USE_PROTOBUF)
-        message (WARNING "gRPC requires protobuf which is disabled")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Will not use internal gRPC without protobuf")
-        set (USE_INTERNAL_GRPC_LIBRARY OFF)
-    else()
-        set (GRPC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc/include")
-        set (GRPC_LIBRARY "libgrpc++")
-        set (USE_GRPC ON)
-        set (USE_INTERNAL_GRPC_LIBRARY ON)
-    endif()
-endif()
-
-message (STATUS "Using gRPC=${USE_GRPC}: ${GRPC_INCLUDE_DIR} : ${GRPC_LIBRARY}")

cmake/find/gtest.cmake

@@ -1,30 +1,22 @@
 option (ENABLE_GTEST_LIBRARY "Enable gtest library" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_GTEST_LIBRARY)
+if (ENABLE_GTEST_LIBRARY)
-    if(USE_INTERNAL_GTEST_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal Google Test when ENABLE_GTEST_LIBRARY=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_GTEST_LIBRARY "Set to FALSE to use system Google Test instead of bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest/CMakeLists.txt")
    if (USE_INTERNAL_GTEST_LIBRARY)
        message (WARNING "submodule contrib/googletest is missing. to fix try run: \n git submodule update --init --recursive")
-       message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal gtest")
        set (USE_INTERNAL_GTEST_LIBRARY 0)
    endif ()
    set (MISSING_INTERNAL_GTEST_LIBRARY 1)
 endif ()
 
+
 if(NOT USE_INTERNAL_GTEST_LIBRARY)
     # TODO: autodetect of GTEST_SRC_DIR by EXISTS /usr/src/googletest/CMakeLists.txt
     if(NOT GTEST_SRC_DIR)
         find_package(GTest)
-        if (NOT GTEST_INCLUDE_DIRS)
-            message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system Google Test")
-        endif()
     endif()
 endif()
 
@@ -34,13 +26,12 @@ if (NOT GTEST_SRC_DIR AND NOT GTEST_INCLUDE_DIRS AND NOT MISSING_INTERNAL_GTEST_
     set (GTEST_LIBRARIES gtest)
     set (GTEST_BOTH_LIBRARIES ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES})
     set (GTEST_INCLUDE_DIRS ${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest)
-elseif(USE_INTERNAL_GTEST_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Wouldn't use internal Google Test library")
-    set (USE_INTERNAL_GTEST_LIBRARY 0)
 endif ()
 
 if((GTEST_INCLUDE_DIRS AND GTEST_BOTH_LIBRARIES) OR GTEST_SRC_DIR)
     set(USE_GTEST 1)
 endif()
 
+endif()
+
 message (STATUS "Using gtest=${USE_GTEST}: ${GTEST_INCLUDE_DIRS} : ${GTEST_BOTH_LIBRARIES} : ${GTEST_SRC_DIR}")

cmake/find/h3.cmake

@@ -1,38 +1,28 @@
 option (ENABLE_H3 "Enable H3" ${ENABLE_LIBRARIES})
-if(NOT ENABLE_H3)
+if (ENABLE_H3)
-    if(USE_INTERNAL_H3_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal h3 library with ENABLE_H3=OFF")
-    endif ()
-    return()
-endif()
 
-option(USE_INTERNAL_H3_LIBRARY "Set to FALSE to use system h3 library instead of bundled" ${NOT_UNBUNDLED})
+option (USE_INTERNAL_H3_LIBRARY "Set to FALSE to use system h3 library instead of bundled" ${NOT_UNBUNDLED})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib/include/h3Index.h")
     if(USE_INTERNAL_H3_LIBRARY)
-        message(WARNING "submodule contrib/h3 is missing. to fix try run: \n git submodule update --init --recursive")
+       message(WARNING "submodule contrib/h3 is missing. to fix try run: \n git submodule update --init --recursive")
-        message(${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal h3 library")
-        set(USE_INTERNAL_H3_LIBRARY 0)
     endif()
     set(MISSING_INTERNAL_H3_LIBRARY 1)
+    set(USE_INTERNAL_H3_LIBRARY 0)
 endif()
 
-if(NOT USE_INTERNAL_H3_LIBRARY)
+if (USE_INTERNAL_H3_LIBRARY)
-    find_library(H3_LIBRARY h3)
+    set (H3_LIBRARY h3)
-    find_path(H3_INCLUDE_DIR NAMES h3/h3api.h PATHS ${H3_INCLUDE_PATHS})
+    set (H3_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib/include)
-
+elseif (NOT MISSING_INTERNAL_H3_LIBRARY)
-    if(NOT H3_LIBRARY OR NOT H3_INCLUDE_DIR)
+    find_library (H3_LIBRARY h3)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system h3 library")
+    find_path (H3_INCLUDE_DIR NAMES h3/h3api.h PATHS ${H3_INCLUDE_PATHS})
-    endif()
+endif ()
-endif()
 
 if (H3_LIBRARY AND H3_INCLUDE_DIR)
     set (USE_H3 1)
-elseif(NOT MISSING_INTERNAL_H3_LIBRARY)
+endif ()
-    set (H3_LIBRARY h3)
+
-    set (H3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib/include")
+endif ()
-    set (USE_H3 1)
-    set (USE_INTERNAL_H3_LIBRARY 1)
-endif()
 
 message (STATUS "Using h3=${USE_H3}: ${H3_INCLUDE_DIR} : ${H3_LIBRARY}")

cmake/find/hdfs3.cmake

@@ -1,33 +1,21 @@
 if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE AND USE_PROTOBUF)
     option(ENABLE_HDFS "Enable HDFS" ${ENABLE_LIBRARIES})
-elseif(ENABLE_HDFS OR USE_INTERNAL_HDFS3_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use HDFS3 with current configuration")
-endif()
-
-if(NOT ENABLE_HDFS)
-    if(USE_INTERNAL_HDFS3_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal HDFS3 library with ENABLE_HDFS3=OFF")
-    endif()
-    return()
 endif()
 
+if(ENABLE_HDFS)
 option(USE_INTERNAL_HDFS3_LIBRARY "Set to FALSE to use system HDFS3 instead of bundled" ${NOT_UNBUNDLED})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/hdfs.h")
     if(USE_INTERNAL_HDFS3_LIBRARY)
-        message(WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init --recursive")
+       message(WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal HDFS3 library")
-        set(USE_INTERNAL_HDFS3_LIBRARY 0)
     endif()
     set(MISSING_INTERNAL_HDFS3_LIBRARY 1)
+    set(USE_INTERNAL_HDFS3_LIBRARY 0)
 endif()
 
 if(NOT USE_INTERNAL_HDFS3_LIBRARY)
     find_library(HDFS3_LIBRARY hdfs3)
     find_path(HDFS3_INCLUDE_DIR NAMES hdfs/hdfs.h PATHS ${HDFS3_INCLUDE_PATHS})
-    if(NOT HDFS3_LIBRARY OR NOT HDFS3_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot find system HDFS3 library")
-    endif()
 endif()
 
 if(HDFS3_LIBRARY AND HDFS3_INCLUDE_DIR)
@@ -38,7 +26,9 @@ elseif(NOT MISSING_INTERNAL_HDFS3_LIBRARY AND LIBGSASL_LIBRARY AND LIBXML2_LIBRA
     set(USE_INTERNAL_HDFS3_LIBRARY 1)
     set(USE_HDFS 1)
 else()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Cannout enable HDFS3")
+    set(USE_INTERNAL_HDFS3_LIBRARY 0)
+endif()
+
 endif()
 
 message(STATUS "Using hdfs3=${USE_HDFS}: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")

cmake/find/icu.cmake

@@ -4,20 +4,13 @@ else ()
     option(ENABLE_ICU "Enable ICU" 0)
 endif ()
 
-if (NOT ENABLE_ICU)
+if (ENABLE_ICU)
-    if(USE_INTERNAL_ICU_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal icu library with ENABLE_ICU=OFF")
-    endif()
-    message(STATUS "Build without ICU (support for collations and charset conversion functions will be disabled)")
-    return()
-endif()
 
 option (USE_INTERNAL_ICU_LIBRARY "Set to FALSE to use system ICU library instead of bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/LICENSE")
     if (USE_INTERNAL_ICU_LIBRARY)
         message (WARNING "submodule contrib/icu is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ICU")
         set (USE_INTERNAL_ICU_LIBRARY 0)
     endif ()
     set (MISSING_INTERNAL_ICU_LIBRARY 1)
@@ -31,8 +24,6 @@ if(NOT USE_INTERNAL_ICU_LIBRARY)
     #set (ICU_LIBRARIES ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY} ${ICU_DATA_LIBRARY} CACHE STRING "")
     if(ICU_FOUND)
         set(USE_ICU 1)
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system ICU")
     endif()
 endif()
 
@@ -44,6 +35,8 @@ elseif (NOT MISSING_INTERNAL_ICU_LIBRARY)
     set (USE_ICU 1)
 endif ()
 
+endif()
+
 if(USE_ICU)
     message(STATUS "Using icu=${USE_ICU}: ${ICU_INCLUDE_DIR} : ${ICU_LIBRARIES}")
 else()

cmake/find/ldap.cmake

@@ -1,97 +1,84 @@
 option (ENABLE_LDAP "Enable LDAP" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_LDAP)
+if (ENABLE_LDAP)
-    if(USE_INTERNAL_LDAP_LIBRARY)
+    option (USE_INTERNAL_LDAP_LIBRARY "Set to FALSE to use system *LDAP library instead of bundled" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal LDAP library with ENABLE_LDAP=OFF")
-    endif ()
-    return()
-endif()
 
-option (USE_INTERNAL_LDAP_LIBRARY "Set to FALSE to use system *LDAP library instead of bundled" ${NOT_UNBUNDLED})
+    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/openldap/README")
-
+        if (USE_INTERNAL_LDAP_LIBRARY)
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/openldap/README")
+            message (WARNING "Submodule contrib/openldap is missing. To fix try running:\n git submodule update --init --recursive")
-    if (USE_INTERNAL_LDAP_LIBRARY)
-        message (WARNING "Submodule contrib/openldap is missing. To fix try running:\n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal LDAP library")
-    endif ()
-
-    set (USE_INTERNAL_LDAP_LIBRARY 0)
-    set (MISSING_INTERNAL_LDAP_LIBRARY 1)
-endif ()
-
-set (OPENLDAP_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
-set (OPENLDAP_USE_REENTRANT_LIBS 1)
-
-if (NOT USE_INTERNAL_LDAP_LIBRARY)
-    if (OPENLDAP_USE_STATIC_LIBS)
-        message (WARNING "Unable to use external static OpenLDAP libraries, falling back to the bundled version.")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Unable to use external OpenLDAP")
-        set (USE_INTERNAL_LDAP_LIBRARY 1)
-    else ()
-        if (APPLE AND NOT OPENLDAP_ROOT_DIR)
-            set (OPENLDAP_ROOT_DIR "/usr/local/opt/openldap")
         endif ()
 
-        find_package (OpenLDAP)
+        set (USE_INTERNAL_LDAP_LIBRARY 0)
-
+        set (MISSING_INTERNAL_LDAP_LIBRARY 1)
-        if (NOT OPENLDAP_FOUND)
-            message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system OpenLDAP")
-        endif()
-    endif ()
-endif ()
-
-if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_LIBRARY)
-    string (TOLOWER "${CMAKE_SYSTEM_NAME}" _system_name)
-    string (TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _system_processor)
-
-    if (
-        "${_system_processor}" STREQUAL "amd64" OR
-        "${_system_processor}" STREQUAL "x64"
-    )
-        set (_system_processor "x86_64")
-    elseif (
-        "${_system_processor}" STREQUAL "arm64"
-    )
-        set (_system_processor "aarch64")
     endif ()
 
-    if (
+    set (OPENLDAP_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
-        ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+    set (OPENLDAP_USE_REENTRANT_LIBS 1)
-        ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "aarch64" ) OR
-        ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64"  ) OR
-        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  )
-    )
-        set (_ldap_supported_platform TRUE)
-    endif ()
 
-    if (NOT _ldap_supported_platform)
+    if (NOT USE_INTERNAL_LDAP_LIBRARY)
-        message (WARNING "LDAP support using the bundled library is not implemented for ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} platform.")
+        if (OPENLDAP_USE_STATIC_LIBS)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable LDAP support")
+            message (WARNING "Unable to use external static OpenLDAP libraries, falling back to the bundled version.")
-    elseif (NOT USE_SSL)
+            set (USE_INTERNAL_LDAP_LIBRARY 1)
-        message (WARNING "LDAP support using the bundled library is not possible if SSL is not used.")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable LDAP support")
-    else ()
-        set (USE_INTERNAL_LDAP_LIBRARY 1)
-        set (OPENLDAP_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
-        set (OPENLDAP_INCLUDE_DIRS
-            "${ClickHouse_SOURCE_DIR}/contrib/openldap-cmake/${_system_name}_${_system_processor}/include"
-            "${ClickHouse_SOURCE_DIR}/contrib/openldap/include"
-        )
-        # Below, 'ldap'/'ldap_r' and 'lber' will be resolved to
-        # the targets defined in contrib/openldap-cmake/CMakeLists.txt
-        if (OPENLDAP_USE_REENTRANT_LIBS)
-            set (OPENLDAP_LDAP_LIBRARY "ldap_r")
         else ()
-            set (OPENLDAP_LDAP_LIBRARY "ldap")
+            if (APPLE AND NOT OPENLDAP_ROOT_DIR)
-        endif()
+                set (OPENLDAP_ROOT_DIR "/usr/local/opt/openldap")
-        set (OPENLDAP_LBER_LIBRARY "lber")
+            endif ()
-        set (OPENLDAP_LIBRARIES ${OPENLDAP_LDAP_LIBRARY} ${OPENLDAP_LBER_LIBRARY})
-        set (OPENLDAP_FOUND 1)
-    endif ()
-endif ()
 
-if (OPENLDAP_FOUND)
+            find_package (OpenLDAP)
-    set (USE_LDAP 1)
+        endif ()
+    endif ()
+
+    if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_LIBRARY)
+        string (TOLOWER "${CMAKE_SYSTEM_NAME}" _system_name)
+        string (TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _system_processor)
+
+        if (
+            "${_system_processor}" STREQUAL "amd64" OR
+            "${_system_processor}" STREQUAL "x64"
+        )
+            set (_system_processor "x86_64")
+        elseif (
+            "${_system_processor}" STREQUAL "arm64"
+        )
+            set (_system_processor "aarch64")
+        endif ()
+
+        if (
+            ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+            ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "aarch64" ) OR
+            ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+            ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  )
+        )
+            set (_ldap_supported_platform TRUE)
+        endif ()
+
+        if (NOT _ldap_supported_platform)
+            message (WARNING "LDAP support using the bundled library is not implemented for ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} platform.")
+        elseif (NOT USE_SSL)
+            message (WARNING "LDAP support using the bundled library is not possible if SSL is not used.")
+        else ()
+            set (USE_INTERNAL_LDAP_LIBRARY 1)
+            set (OPENLDAP_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
+            set (OPENLDAP_INCLUDE_DIRS
+                "${ClickHouse_SOURCE_DIR}/contrib/openldap-cmake/${_system_name}_${_system_processor}/include"
+                "${ClickHouse_SOURCE_DIR}/contrib/openldap/include"
+            )
+            # Below, 'ldap'/'ldap_r' and 'lber' will be resolved to
+            # the targets defined in contrib/openldap-cmake/CMakeLists.txt
+            if (OPENLDAP_USE_REENTRANT_LIBS)
+                set (OPENLDAP_LDAP_LIBRARY "ldap_r")
+            else ()
+                set (OPENLDAP_LDAP_LIBRARY "ldap")
+            endif()
+            set (OPENLDAP_LBER_LIBRARY "lber")
+            set (OPENLDAP_LIBRARIES ${OPENLDAP_LDAP_LIBRARY} ${OPENLDAP_LBER_LIBRARY})
+            set (OPENLDAP_FOUND 1)
+        endif ()
+    endif ()
+
+    if (OPENLDAP_FOUND)
+        set (USE_LDAP 1)
+    endif ()
 endif ()
 
 message (STATUS "Using ldap=${USE_LDAP}: ${OPENLDAP_INCLUDE_DIRS} : ${OPENLDAP_LIBRARIES}")

cmake/find/libgsasl.cmake

@@ -1,18 +1,12 @@
 option(ENABLE_GSASL_LIBRARY "Enable gsasl library" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_GSASL_LIBRARY)
+if (ENABLE_GSASL_LIBRARY)
-    if(USE_INTERNAL_LIBGSASL_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal libgsasl library with ENABLE_GSASL_LIBRARY=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_LIBGSASL_LIBRARY "Set to FALSE to use system libgsasl library instead of bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src/gsasl.h")
     if (USE_INTERNAL_LIBGSASL_LIBRARY)
         message (WARNING "submodule contrib/libgsasl is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libgsasl")
         set (USE_INTERNAL_LIBGSASL_LIBRARY 0)
     endif ()
     set (MISSING_INTERNAL_LIBGSASL_LIBRARY 1)
@@ -20,15 +14,12 @@ endif ()
 
 if (NOT USE_INTERNAL_LIBGSASL_LIBRARY)
     find_library (LIBGSASL_LIBRARY gsasl)
-    find_path (LIBGSASL_INCLUDE_DIR  NAMES gsasl.h PATHS ${LIBGSASL_INCLUDE_PATHS})
+    find_path (LIBGSASL_INCLUDE_DIR NAMES gsasl.h PATHS ${LIBGSASL_INCLUDE_PATHS})
-    if (NOT LIBGSASL_LIBRARY OR NOT LIBGSASL_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system libgsasl")
-    endif ()
 endif ()
 
 if (LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)
 elseif (NOT MISSING_INTERNAL_LIBGSASL_LIBRARY)
-    set (LIBGSASL_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src" "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include")
+    set (LIBGSASL_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include)
     set (USE_INTERNAL_LIBGSASL_LIBRARY 1)
     set (LIBGSASL_LIBRARY libgsasl)
 endif ()
@@ -37,4 +28,6 @@ if(LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)
     set (USE_LIBGSASL 1)
 endif()
 
+endif()
+
 message (STATUS "Using libgsasl=${USE_LIBGSASL}: ${LIBGSASL_INCLUDE_DIR} : ${LIBGSASL_LIBRARY}")

cmake/find/libxml2.cmake

@@ -3,7 +3,6 @@ option (USE_INTERNAL_LIBXML2_LIBRARY "Set to FALSE to use system libxml2 library
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libxml2/libxml.h")
     if (USE_INTERNAL_LIBXML2_LIBRARY)
         message (WARNING "submodule contrib/libxml2 is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libxml")
         set (USE_INTERNAL_LIBXML2_LIBRARY 0)
     endif ()
     set (MISSING_INTERNAL_LIBXML2_LIBRARY 1)
@@ -13,10 +12,6 @@ if (NOT USE_INTERNAL_LIBXML2_LIBRARY)
     find_package (LibXml2)
     #find_library (LIBXML2_LIBRARY libxml2)
     #find_path (LIBXML2_INCLUDE_DIR NAMES libxml.h PATHS ${LIBXML2_INCLUDE_PATHS})
-
-    if (NOT LIBXML2_LIBRARY OR NOT LIBXML2_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system libxml2")
-    endif ()
 endif ()
 
 if (LIBXML2_LIBRARY AND LIBXML2_INCLUDE_DIR)

cmake/find/llvm.cmake

@@ -2,89 +2,78 @@
 if (NOT APPLE)
     option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile_expressions' option for query execution" ${ENABLE_LIBRARIES})
     option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library." ${NOT_UNBUNDLED})
-elseif(ENABLE_EMBEDDED_COMPILER OR USE_INTERNAL_LLVM_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Embedded compiler is not currently supported on Apple")
 endif ()
 
-if (NOT ENABLE_EMBEDDED_COMPILER)
+if (ENABLE_EMBEDDED_COMPILER)
-    if(USE_INTERNAL_LLVM_LIBRARY)
+    if (USE_INTERNAL_LLVM_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal LLVM library with ENABLE_EMBEDDED_COMPILER=OFF")
+        message (WARNING "submodule contrib/llvm is missing. to fix try run: \n git submodule update --init --recursive")
-    endif()
+        set (USE_INTERNAL_LLVM_LIBRARY 0)
-    return()
+    endif ()
-endif()
 
-if (USE_INTERNAL_LLVM_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
+    if (NOT USE_INTERNAL_LLVM_LIBRARY)
-    message (WARNING "submodule contrib/llvm is missing. to fix try run: \n git submodule update --init --recursive")
+        set (LLVM_PATHS "/usr/local/lib/llvm")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't fidd internal LLVM library")
-    set (USE_INTERNAL_LLVM_LIBRARY 0)
-endif ()
 
-if (NOT USE_INTERNAL_LLVM_LIBRARY)
+        foreach(llvm_v 9 8)
-    set (LLVM_PATHS "/usr/local/lib/llvm")
+            if (NOT LLVM_FOUND)
+                find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
+            endif ()
+        endforeach ()
 
-    foreach(llvm_v 9 8)
+        if (LLVM_FOUND)
-        if (NOT LLVM_FOUND)
+            # Remove dynamically-linked zlib and libedit from LLVM's dependencies:
-            find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
+            set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_LIBRARIES "-lpthread;LLVMDemangle;${ZLIB_LIBRARIES}")
+            set_target_properties(LLVMLineEditor PROPERTIES INTERFACE_LINK_LIBRARIES "LLVMSupport")
+
+            option(LLVM_HAS_RTTI "Enable if LLVM was build with RTTI enabled" ON)
+            set (USE_EMBEDDED_COMPILER 1)
+        else()
+            set (USE_EMBEDDED_COMPILER 0)
+        endif()
+
+        if (LLVM_FOUND AND OS_LINUX AND USE_LIBCXX)
+            message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY is not set but the LLVM library from OS packages in Linux is incompatible with libc++ ABI. LLVM Will be disabled.")
+            set (LLVM_FOUND 0)
+            set (USE_EMBEDDED_COMPILER 0)
         endif ()
-    endforeach ()
+    else()
+        if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+            message(WARNING "Option ENABLE_EMBEDDED_COMPILER is set but LLVM library cannot build if build directory is the same as source directory.")
+            set (LLVM_FOUND 0)
+            set (USE_EMBEDDED_COMPILER 0)
+        elseif (SPLIT_SHARED_LIBRARIES)
+            # llvm-tablegen cannot find shared libraries that we build. Probably can be easily fixed.
+            message(WARNING "Option ENABLE_EMBEDDED_COMPILER is not compatible with SPLIT_SHARED_LIBRARIES. Build of LLVM will be disabled.")
+            set (LLVM_FOUND 0)
+            set (USE_EMBEDDED_COMPILER 0)
+        elseif (NOT ARCH_AMD64)
+            # It's not supported yet, but you can help.
+            message(WARNING "Option ENABLE_EMBEDDED_COMPILER is only available for x86_64. Build of LLVM will be disabled.")
+            set (LLVM_FOUND 0)
+            set (USE_EMBEDDED_COMPILER 0)
+        elseif (SANITIZE STREQUAL "undefined")
+            # llvm-tblgen, that is used during LLVM build, doesn't work with UBSan.
+            message(WARNING "Option ENABLE_EMBEDDED_COMPILER does not work with UBSan, because 'llvm-tblgen' tool from LLVM has undefined behaviour. Build of LLVM will be disabled.")
+            set (LLVM_FOUND 0)
+            set (USE_EMBEDDED_COMPILER 0)
+        else ()
+            set (LLVM_FOUND 1)
+            set (USE_EMBEDDED_COMPILER 1)
+            set (LLVM_VERSION "9.0.0bundled")
+            set (LLVM_INCLUDE_DIRS
+                ${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/include
+                ${ClickHouse_BINARY_DIR}/contrib/llvm/llvm/include
+            )
+            set (LLVM_LIBRARY_DIRS ${ClickHouse_BINARY_DIR}/contrib/llvm/llvm)
+        endif()
+    endif()
 
     if (LLVM_FOUND)
-        # Remove dynamically-linked zlib and libedit from LLVM's dependencies:
+        message(STATUS "LLVM include Directory: ${LLVM_INCLUDE_DIRS}")
-        set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_LIBRARIES "-lpthread;LLVMDemangle;${ZLIB_LIBRARIES}")
+        message(STATUS "LLVM library Directory: ${LLVM_LIBRARY_DIRS}")
-        set_target_properties(LLVMLineEditor PROPERTIES INTERFACE_LINK_LIBRARIES "LLVMSupport")
+        message(STATUS "LLVM C++ compiler flags: ${LLVM_CXXFLAGS}")
-
-        option(LLVM_HAS_RTTI "Enable if LLVM was build with RTTI enabled" ON)
-        set (USE_EMBEDDED_COMPILER 1)
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system LLVM")
-        set (USE_EMBEDDED_COMPILER 0)
-    endif()
-
-    if (LLVM_FOUND AND OS_LINUX AND USE_LIBCXX)
-        message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY is not set but the LLVM library from OS packages in Linux is incompatible with libc++ ABI. LLVM Will be disabled.")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Unsupported LLVM configuration, cannot enable LLVM")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    endif ()
-else()
-    if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-        message(WARNING "Option ENABLE_EMBEDDED_COMPILER is set but LLVM library cannot build if build directory is the same as source directory.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (SPLIT_SHARED_LIBRARIES)
-        # llvm-tablegen cannot find shared libraries that we build. Probably can be easily fixed.
-        message(WARNING "Option ENABLE_EMBEDDED_COMPILER is not compatible with SPLIT_SHARED_LIBRARIES. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (NOT ARCH_AMD64)
-        # It's not supported yet, but you can help.
-        message(WARNING "Option ENABLE_EMBEDDED_COMPILER is only available for x86_64. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (SANITIZE STREQUAL "undefined")
-        # llvm-tblgen, that is used during LLVM build, doesn't work with UBSan.
-        message(WARNING "Option ENABLE_EMBEDDED_COMPILER does not work with UBSan, because 'llvm-tblgen' tool from LLVM has undefined behaviour. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    else ()
-        set (LLVM_FOUND 1)
-        set (USE_EMBEDDED_COMPILER 1)
-        set (LLVM_VERSION "9.0.0bundled")
-        set (LLVM_INCLUDE_DIRS
-            ${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/include
-            ${ClickHouse_BINARY_DIR}/contrib/llvm/llvm/include
-        )
-        set (LLVM_LIBRARY_DIRS ${ClickHouse_BINARY_DIR}/contrib/llvm/llvm)
     endif()
 endif()
 
-if (LLVM_FOUND)
-    message(STATUS "LLVM include Directory: ${LLVM_INCLUDE_DIRS}")
-    message(STATUS "LLVM library Directory: ${LLVM_LIBRARY_DIRS}")
-    message(STATUS "LLVM C++ compiler flags: ${LLVM_CXXFLAGS}")
-else()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable LLVM")
-endif()
 
 # This list was generated by listing all LLVM libraries, compiling the binary and removing all libraries while it still compiles.
 set (REQUIRED_LLVM_LIBRARIES

cmake/find/ltdl.cmake

@@ -1,5 +1,5 @@
 if (ENABLE_ODBC AND NOT USE_INTERNAL_ODBC_LIBRARY)
     set (LTDL_PATHS "/usr/local/opt/libtool/lib")
-    find_library (LTDL_LIBRARY ltdl PATHS ${LTDL_PATHS} REQUIRED)
+    find_library (LTDL_LIBRARY ltdl PATHS ${LTDL_PATHS})
     message (STATUS "Using ltdl: ${LTDL_LIBRARY}")
 endif ()

cmake/find/msgpack.cmake

@@ -1,37 +1,27 @@
 option (ENABLE_MSGPACK "Enable msgpack library" ${ENABLE_LIBRARIES})
 
-if(NOT ENABLE_MSGPACK)
+if (ENABLE_MSGPACK)
-    if(USE_INTERNAL_MSGPACK_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal msgpack with ENABLE_MSGPACK=OFF")
-    endif()
-    return()
-endif()
 
 option (USE_INTERNAL_MSGPACK_LIBRARY "Set to FALSE to use system msgpack library instead of bundled" ${NOT_UNBUNDLED})
 
-if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include/msgpack.hpp")
+if (USE_INTERNAL_MSGPACK_LIBRARY)
-    if(USE_INTERNAL_MSGPACK_LIBRARY)
+    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include/msgpack.hpp")
         message(WARNING "Submodule contrib/msgpack-c is missing. To fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal msgpack")
+        set(USE_INTERNAL_MSGPACK_LIBRARY     0)
-        set(USE_INTERNAL_MSGPACK_LIBRARY 0)
+        set(MISSING_INTERNAL_MSGPACK_LIBRARY 1)
     endif()
-    set(MISSING_INTERNAL_MSGPACK_LIBRARY 1)
 endif()
 
-if(NOT USE_INTERNAL_MSGPACK_LIBRARY)
+if (USE_INTERNAL_MSGPACK_LIBRARY)
+    set(MSGPACK_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include)
+else()
     find_path(MSGPACK_INCLUDE_DIR NAMES msgpack.hpp PATHS ${MSGPACK_INCLUDE_PATHS})
-    if(NOT MSGPACK_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system msgpack")
-    endif()
-endif()
-
-if(NOT MSGPACK_INCLUDE_DIR AND NOT MISSING_INTERNAL_MSGPACK_LIBRARY)
-    set(MSGPACK_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include")
-    set(USE_INTERNAL_MSGPACK_LIBRARY 1)
 endif()
 
 if (MSGPACK_INCLUDE_DIR)
     set(USE_MSGPACK 1)
 endif()
 
+endif()
+
 message(STATUS "Using msgpack=${USE_MSGPACK}: ${MSGPACK_INCLUDE_DIR}")

cmake/find/mysqlclient.cmake

@@ -4,71 +4,56 @@ else ()
     option(ENABLE_MYSQL "Enable MySQL" FALSE)
 endif ()
 
-if(NOT ENABLE_MYSQL)
+if(ENABLE_MYSQL)
-    if (USE_INTERNAL_MYSQL_LIBRARY)
+    option(USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal mysql library with ENABLE_MYSQL=OFF")
-    endif ()
-    message (STATUS "Build without mysqlclient (support for MYSQL dictionary source will be disabled)")
-    return()
-endif()
 
-option(USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" ${NOT_UNBUNDLED})
+    if(USE_INTERNAL_MYSQL_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/README")
-
-if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/README")
-    if(USE_INTERNAL_MYSQL_LIBRARY)
         message(WARNING "submodule contrib/mariadb-connector-c is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal mysql library")
         set(USE_INTERNAL_MYSQL_LIBRARY 0)
     endif()
-    set(MISSING_INTERNAL_MYSQL_LIBRARY 1)
-endif()
 
-if (NOT USE_INTERNAL_MYSQL_LIBRARY)
+    if (USE_INTERNAL_MYSQL_LIBRARY)
-    set (MYSQL_LIB_PATHS
+        set (MYSQLCLIENT_LIBRARIES mariadbclient)
-        "/usr/local/opt/mysql/lib"
-        "/usr/local/lib"
-        "/usr/local/lib64"
-        "/usr/local/lib/mariadb" # macos brew mariadb-connector-c
-        "/usr/mysql/lib"
-        "/usr/mysql/lib64"
-        "/usr/lib"
-        "/usr/lib64"
-        "/lib"
-        "/lib64")
-
-    set (MYSQL_INCLUDE_PATHS
-        "/usr/local/opt/mysql/include"
-        "/usr/mysql/include"
-        "/usr/local/include"
-        "/usr/include")
-
-    find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h mariadb/mysql.h PATHS ${MYSQL_INCLUDE_PATHS} PATH_SUFFIXES mysql)
-
-    if (USE_STATIC_LIBRARIES)
-        find_library (STATIC_MYSQLCLIENT_LIB NAMES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS} PATH_SUFFIXES mysql)
-    else ()
-        find_library (MYSQLCLIENT_LIBRARIES NAMES mariadb mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS} PATH_SUFFIXES mysql)
-    endif ()
-
-    if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES))
         set (USE_MYSQL 1)
         set (MYSQLXX_LIBRARY mysqlxx)
-        if (APPLE)
-            # /usr/local/include/mysql/mysql_com.h:1011:10: fatal error: mysql/udf_registration_types.h: No such file or directory
-            set(MYSQL_INCLUDE_DIR ${MYSQL_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}/mysql)
-        endif ()
     else ()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system mysql library")
+        set (MYSQL_LIB_PATHS
+            "/usr/local/opt/mysql/lib"
+            "/usr/local/lib"
+            "/usr/local/lib64"
+            "/usr/local/lib/mariadb" # macos brew mariadb-connector-c
+            "/usr/mysql/lib"
+            "/usr/mysql/lib64"
+            "/usr/lib"
+            "/usr/lib64"
+            "/lib"
+            "/lib64")
+
+        set (MYSQL_INCLUDE_PATHS
+            "/usr/local/opt/mysql/include"
+            "/usr/mysql/include"
+            "/usr/local/include"
+            "/usr/include")
+
+        find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h mariadb/mysql.h PATHS ${MYSQL_INCLUDE_PATHS} PATH_SUFFIXES mysql)
+
+        if (USE_STATIC_LIBRARIES)
+            find_library (STATIC_MYSQLCLIENT_LIB NAMES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS} PATH_SUFFIXES mysql)
+        else ()
+            find_library (MYSQLCLIENT_LIBRARIES NAMES mariadb mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS} PATH_SUFFIXES mysql)
+        endif ()
+
+        if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES))
+            set (USE_MYSQL 1)
+            set (MYSQLXX_LIBRARY mysqlxx)
+            if (APPLE)
+                # /usr/local/include/mysql/mysql_com.h:1011:10: fatal error: mysql/udf_registration_types.h: No such file or directory
+                set(MYSQL_INCLUDE_DIR ${MYSQL_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}/mysql)
+            endif ()
+        endif ()
     endif ()
 endif ()
 
-if (NOT USE_MYSQL AND NOT MISSING_INTERNAL_MYSQL_LIBRARY)
-    set (MYSQLCLIENT_LIBRARIES mariadbclient)
-    set (MYSQLXX_LIBRARY mysqlxx)
-    set (USE_MYSQL 1)
-    set (USE_INTERNAL_MYSQL_LIBRARY 1)
-endif()
-
 if (USE_MYSQL)
     message (STATUS "Using mysqlclient=${USE_MYSQL}: ${MYSQL_INCLUDE_DIR} : ${MYSQLCLIENT_LIBRARIES}; staticlib=${STATIC_MYSQLCLIENT_LIB}")
 else ()

cmake/find/opencl.cmake

@@ -3,14 +3,12 @@ if(0)
     option(ENABLE_OPENCL "Enable OpenCL support" ${ENABLE_LIBRARIES})
 endif()
 
-if(NOT ENABLE_OPENCL)
+if(ENABLE_OPENCL)
-    return()
-endif()
 
 # Intel OpenCl driver: sudo apt install intel-opencl-icd
 # @sa https://github.com/intel/compute-runtime/releases
 
-# OpenCL applications should link with ICD loader
+# OpenCL applications should link wiht ICD loader
 # sudo apt install opencl-headers ocl-icd-libopencl1
 # sudo ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so
 # TODO: add https://github.com/OCL-dev/ocl-icd as submodule instead
@@ -18,8 +16,8 @@ endif()
 find_package(OpenCL)
 if(OpenCL_FOUND)
     set(USE_OPENCL 1)
-else()
+endif()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable OpenCL support")
+
 endif()
 
 message(STATUS "Using opencl=${USE_OPENCL}: ${OpenCL_INCLUDE_DIRS} : ${OpenCL_LIBRARIES}")

cmake/find/orc.cmake

@@ -1,20 +1,12 @@
 option (ENABLE_ORC "Enable ORC" ${ENABLE_LIBRARIES})
 
-if(NOT ENABLE_ORC)
+if(ENABLE_ORC)
-    if(USE_INTERNAL_ORC_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal ORC library with ENABLE_ORD=OFF")
-    endif()
-    return()
-endif()
-
-option(USE_INTERNAL_ORC_LIBRARY "Set to FALSE to use system ORC instead of bundled" ${NOT_UNBUNDLED})
-
 include(cmake/find/snappy.cmake)
+option(USE_INTERNAL_ORC_LIBRARY "Set to FALSE to use system ORC instead of bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include/orc/OrcFile.hh")
    if(USE_INTERNAL_ORC_LIBRARY)
        message(WARNING "submodule contrib/orc is missing. to fix try run: \n git submodule update --init --recursive")
-       message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ORC")
        set(USE_INTERNAL_ORC_LIBRARY 0)
    endif()
    set(MISSING_INTERNAL_ORC_LIBRARY 1)
@@ -22,9 +14,6 @@ endif ()
 
 if (NOT USE_INTERNAL_ORC_LIBRARY)
     find_package(orc)
-    if (NOT ORC_LIBRARY OR NOT ORC_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system ORC")
-    endif ()
 endif ()
 
 #if (USE_INTERNAL_ORC_LIBRARY)
@@ -41,10 +30,10 @@ elseif(NOT MISSING_INTERNAL_ORC_LIBRARY AND ARROW_LIBRARY AND SNAPPY_LIBRARY) #
     set(ORC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include")
     set(ORC_LIBRARY orc)
     set(USE_ORC 1)
-    set(USE_INTERNAL_ORC_LIBRARY 1)
 else()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable ORC support - missing dependencies")
     set(USE_INTERNAL_ORC_LIBRARY 0)
 endif()
 
+endif()
+
 message (STATUS "Using internal=${USE_INTERNAL_ORC_LIBRARY} orc=${USE_ORC}: ${ORC_INCLUDE_DIR} : ${ORC_LIBRARY}")

cmake/find/parquet.cmake

@@ -1,39 +1,24 @@
 if (Protobuf_PROTOC_EXECUTABLE)
     option (ENABLE_PARQUET "Enable parquet" ${ENABLE_LIBRARIES})
-elseif(ENABLE_PARQUET OR USE_INTERNAL_PARQUET_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use parquet without protoc executable")
 endif()
 
-if (NOT ENABLE_PARQUET)
+if (ENABLE_PARQUET)
-    if(USE_INTERNAL_PARQUET_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal parquet with ENABLE_PARQUET=OFF")
-    endif()
-    message(STATUS "Building without Parquet support")
-    return()
-endif()
 
 if (NOT OS_FREEBSD) # Freebsd: ../contrib/arrow/cpp/src/arrow/util/bit-util.h:27:10: fatal error: endian.h: No such file or directory
     option(USE_INTERNAL_PARQUET_LIBRARY "Set to FALSE to use system parquet library instead of bundled" ${NOT_UNBUNDLED})
-elseif(USE_INTERNAL_PARQUET_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal parquet is not supported on freebsd")
 endif()
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/CMakeLists.txt")
     if(USE_INTERNAL_PARQUET_LIBRARY)
         message(WARNING "submodule contrib/arrow (required for Parquet) is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal parquet library")
-        set(USE_INTERNAL_PARQUET_LIBRARY 0)
     endif()
+    set(USE_INTERNAL_PARQUET_LIBRARY 0)
     set(MISSING_INTERNAL_PARQUET_LIBRARY 1)
 endif()
 
 if(NOT USE_INTERNAL_PARQUET_LIBRARY)
     find_package(Arrow)
     find_package(Parquet)
-
-    if(NOT ARROW_INCLUDE_DIR OR PARQUET_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system parquet: arrow=${ARROW_INCLUDE_DIR} parquet=${PARQUET_INCLUDE_DIR}" )
-    endif()
 endif()
 
 if(ARROW_INCLUDE_DIR AND PARQUET_INCLUDE_DIR)
@@ -41,8 +26,6 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
     include(cmake/find/snappy.cmake)
     if(SNAPPY_LIBRARY)
         set(CAN_USE_INTERNAL_PARQUET_LIBRARY 1)
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal parquet library without snappy")
     endif()
 
     include(CheckCXXSourceCompiles)
@@ -50,20 +33,19 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
         set(CMAKE_REQUIRED_LIBRARIES ${DOUBLE_CONVERSION_LIBRARIES})
         set(CMAKE_REQUIRED_INCLUDES ${DOUBLE_CONVERSION_INCLUDE_DIR})
         check_cxx_source_compiles("
-               #include <double-conversion/double-conversion.h>
+            #include <double-conversion/double-conversion.h>
-               int main() { static const int flags_ = double_conversion::StringToDoubleConverter::ALLOW_CASE_INSENSIBILITY; return 0;}
+            int main() { static const int flags_ = double_conversion::StringToDoubleConverter::ALLOW_CASE_INSENSIBILITY; return 0;}
         " HAVE_DOUBLE_CONVERSION_ALLOW_CASE_INSENSIBILITY)
 
         if(NOT HAVE_DOUBLE_CONVERSION_ALLOW_CASE_INSENSIBILITY) # HAVE_STD_RANDOM_SHUFFLE
-                message (${RECONFIGURE_MESSAGE_LEVEL} "Disabling internal parquet library because arrow is broken (can't use old double_conversion)")
+            message(STATUS "Disabling internal parquet library because arrow is broken (can't use old double_conversion)")
-                set(CAN_USE_INTERNAL_PARQUET_LIBRARY 0)
+            set(CAN_USE_INTERNAL_PARQUET_LIBRARY 0)
         endif()
     endif()
 
-    if(NOT CAN_USE_INTERNAL_PARQUET_LIBRARY)
+   if(NOT CAN_USE_INTERNAL_PARQUET_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal parquet")
         set(USE_INTERNAL_PARQUET_LIBRARY 0)
-    else()
+   else()
     set(USE_INTERNAL_PARQUET_LIBRARY 1)
 
     if(USE_INTERNAL_PARQUET_LIBRARY_NATIVE_CMAKE)
@@ -71,7 +53,7 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
         set(PARQUET_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src" ${ClickHouse_BINARY_DIR}/contrib/arrow/cpp/src)
     endif()
 
-    if(MAKE_STATIC_LIBRARIES)
+    if(${USE_STATIC_LIBRARIES})
         set(FLATBUFFERS_LIBRARY flatbuffers)
         set(ARROW_LIBRARY arrow_static)
         set(PARQUET_LIBRARY parquet_static)
@@ -90,8 +72,8 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
     set(USE_ORC 1)
     set(USE_ARROW 1)
    endif()
-elseif(OS_FREEBSD)
+endif()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal parquet library on FreeBSD is not supported")
+
 endif()
 
 if(USE_PARQUET)

cmake/find/protobuf.cmake

@@ -1,18 +1,12 @@
 option(ENABLE_PROTOBUF "Enable protobuf" ${ENABLE_LIBRARIES})
 
-if(NOT ENABLE_PROTOBUF)
+if(ENABLE_PROTOBUF)
-    if(USE_INTERNAL_PROTOBUF_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal protobuf with ENABLE_PROTOBUF=OFF")
-    endif()
-    return()
-endif()
 
 option(USE_INTERNAL_PROTOBUF_LIBRARY "Set to FALSE to use system protobuf instead of bundled" ${NOT_UNBUNDLED})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/protobuf/cmake/CMakeLists.txt")
    if(USE_INTERNAL_PROTOBUF_LIBRARY)
        message(WARNING "submodule contrib/protobuf is missing. to fix try run: \n git submodule update --init --recursive")
-       message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal protobuf")
        set(USE_INTERNAL_PROTOBUF_LIBRARY 0)
    endif()
    set(MISSING_INTERNAL_PROTOBUF_LIBRARY 1)
@@ -20,9 +14,6 @@ endif()
 
 if(NOT USE_INTERNAL_PROTOBUF_LIBRARY)
     find_package(Protobuf)
-    if (NOT Protobuf_LIBRARY OR NOT Protobuf_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system protobuf")
-    endif()
 endif()
 
 if (Protobuf_LIBRARY AND Protobuf_INCLUDE_DIR)
@@ -45,11 +36,11 @@ if(OS_FREEBSD AND SANITIZE STREQUAL "address")
     if(LLVM_INCLUDE_DIRS)
         set(Protobuf_INCLUDE_DIR ${Protobuf_INCLUDE_DIR} ${LLVM_INCLUDE_DIRS})
     else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use protobuf on FreeBSD with address sanitizer without LLVM")
         set(USE_PROTOBUF 0)
     endif()
 endif()
 
 include (${ClickHouse_SOURCE_DIR}/cmake/protobuf_generate_cpp.cmake)
+endif()
 
 message(STATUS "Using protobuf=${USE_PROTOBUF}: ${Protobuf_INCLUDE_DIR} : ${Protobuf_LIBRARY} : ${Protobuf_PROTOC_EXECUTABLE}")

cmake/find/rapidjson.cmake

@@ -1,8 +1,5 @@
 option(ENABLE_RAPIDJSON "Use rapidjson" ${ENABLE_LIBRARIES})
 if(NOT ENABLE_RAPIDJSON)
-    if(USE_INTERNAL_RAPIDJSON_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal rapidjson library with ENABLE_RAPIDJSON=OFF")
-    endif()
     return()
 endif()
 
@@ -11,7 +8,6 @@ option(USE_INTERNAL_RAPIDJSON_LIBRARY "Set to FALSE to use system rapidjson libr
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include/rapidjson/rapidjson.h")
     if(USE_INTERNAL_RAPIDJSON_LIBRARY)
        message(WARNING "submodule contrib/rapidjson is missing. to fix try run: \n git submodule update --init --recursive")
-       message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal rapidjson library")
        set(USE_INTERNAL_RAPIDJSON_LIBRARY 0)
     endif()
     set(MISSING_INTERNAL_RAPIDJSON_LIBRARY 1)
@@ -19,9 +15,6 @@ endif()
 
 if(NOT USE_INTERNAL_RAPIDJSON_LIBRARY)
     find_path(RAPIDJSON_INCLUDE_DIR NAMES rapidjson/rapidjson.h PATHS ${RAPIDJSON_INCLUDE_PATHS})
-    if(NOT RAPIDJSON_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system rapidjson")
-    endif()
 endif()
 
 if(RAPIDJSON_INCLUDE_DIR)

cmake/find/rdkafka.cmake

@@ -1,55 +1,30 @@
 # Freebsd: contrib/cppkafka/include/cppkafka/detail/endianness.h:53:23: error: 'betoh16' was not declared in this scope
 if (NOT ARCH_ARM AND NOT OS_FREEBSD AND OPENSSL_FOUND)
     option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
-elseif(ENABLE_RDKAFKA AND NOT OPENSSL_FOUND)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use librdkafka without SSL")
-else(ENABLE_RDKAFKA)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "librdafka is not supported on ARM and on FreeBSD")
-endif ()
-
-if (NOT ENABLE_RDKAFKA)
-    if (USE_INTERNAL_RDKAFKA_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal librdkafka with ENABLE_RDKAFKA=OFF")
-    endif()
-    return()
-endif()
-
-if (NOT ARCH_ARM AND USE_LIBGSASL)
-    option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
-elseif(USE_INTERNAL_RDKAFKA_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal librdkafka with ARCH_ARM=${ARCH_ARM} AND USE_LIBGSASL=${USE_LIBGSASL}")
 endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cppkafka/CMakeLists.txt")
-    if(USE_INTERNAL_RDKAFKA_LIBRARY)
+   message (WARNING "submodule contrib/cppkafka is missing. to fix try run: \n git submodule update --init --recursive")
-        message (WARNING "submodule contrib/cppkafka is missing. to fix try run: \n git submodule update --init --recursive")
+   set (ENABLE_RDKAFKA 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal cppkafka")
-        set (USE_INTERNAL_RDKAFKA_LIBRARY 0)
-    endif()
-    set (MISSING_INTERNAL_CPPKAFKA_LIBRARY 1)
 endif ()
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/CMakeLists.txt")
+if (ENABLE_RDKAFKA)
-    if(USE_INTERNAL_RDKAFKA_LIBRARY OR MISSING_INTERNAL_CPPKAFKA_LIBRARY)
+
-        message (WARNING "submodule contrib/librdkafka is missing. to fix try run: \n git submodule update --init --recursive")
+if (NOT ARCH_ARM AND USE_LIBGSASL)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal rdkafka")
+    option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
-        set (USE_INTERNAL_RDKAFKA_LIBRARY 0)
+endif ()
-    endif()
+
-    set (MISSING_INTERNAL_RDKAFKA_LIBRARY 1)
+if (USE_INTERNAL_RDKAFKA_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/CMakeLists.txt")
+   message (WARNING "submodule contrib/librdkafka is missing. to fix try run: \n git submodule update --init --recursive")
+   set (USE_INTERNAL_RDKAFKA_LIBRARY 0)
+   set (MISSING_INTERNAL_RDKAFKA_LIBRARY 1)
 endif ()
 
 if (NOT USE_INTERNAL_RDKAFKA_LIBRARY)
     find_library (RDKAFKA_LIB rdkafka)
     find_path (RDKAFKA_INCLUDE_DIR NAMES librdkafka/rdkafka.h PATHS ${RDKAFKA_INCLUDE_PATHS})
-    if (NOT RDKAFKA_LIB OR NOT RDKAFKA_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system librdkafka")
-    endif()
-
     if (USE_STATIC_LIBRARIES AND NOT OS_FREEBSD)
        find_library (SASL2_LIBRARY sasl2)
-       if (NOT SASL2_LIBRARY)
-           message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system sasl2 library needed for static librdkafka")
-       endif()
     endif ()
     set (CPPKAFKA_LIBRARY cppkafka) # TODO: try to use unbundled version.
 endif ()
@@ -64,14 +39,14 @@ if (RDKAFKA_LIB AND RDKAFKA_INCLUDE_DIR)
     if (LZ4_LIBRARY)
        list (APPEND RDKAFKA_LIBRARY ${LZ4_LIBRARY})
     endif ()
-elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT MISSING_INTERNAL_CPPKAFKA_LIBRARY AND NOT ARCH_ARM)
+elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT ARCH_ARM)
     set (USE_INTERNAL_RDKAFKA_LIBRARY 1)
     set (RDKAFKA_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
     set (RDKAFKA_LIBRARY rdkafka)
     set (CPPKAFKA_LIBRARY cppkafka)
     set (USE_RDKAFKA 1)
-elseif(ARCH_ARM)
+endif ()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal rdkafka on ARM is not supported")
+
 endif ()
 
 message (STATUS "Using librdkafka=${USE_RDKAFKA}: ${RDKAFKA_INCLUDE_DIR} : ${RDKAFKA_LIBRARY} ${CPPKAFKA_LIBRARY}")

cmake/find/re2.cmake

@@ -3,7 +3,6 @@ option (USE_INTERNAL_RE2_LIBRARY "Set to FALSE to use system re2 library instead
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/re2/CMakeLists.txt")
     if(USE_INTERNAL_RE2_LIBRARY)
         message(WARNING "submodule contrib/re2 is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal re2 library")
     endif()
     set(USE_INTERNAL_RE2_LIBRARY 0)
     set(MISSING_INTERNAL_RE2_LIBRARY 1)
@@ -12,9 +11,6 @@ endif()
 if (NOT USE_INTERNAL_RE2_LIBRARY)
     find_library (RE2_LIBRARY re2)
     find_path (RE2_INCLUDE_DIR NAMES re2/re2.h PATHS ${RE2_INCLUDE_PATHS})
-    if (NOT RE2_LIBRARY OR NOT RE2_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system re2 library")
-    endif ()
 endif ()
 
 string(FIND ${CMAKE_CURRENT_BINARY_DIR} " " _have_space)
@@ -28,13 +24,12 @@ if (RE2_LIBRARY AND RE2_INCLUDE_DIR)
 elseif (NOT MISSING_INTERNAL_RE2_LIBRARY)
     set (USE_INTERNAL_RE2_LIBRARY 1)
     set (RE2_LIBRARY re2)
-    set (RE2_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/re2")
+    set (RE2_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/re2)
     if (NOT MISSING_INTERNAL_RE2_ST_LIBRARY)
         set (RE2_ST_LIBRARY re2_st)
         set (USE_RE2_ST 1)
     else ()
         set (RE2_ST_LIBRARY ${RE2_LIBRARY})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal re2 library instead of re2_st")
     endif ()
 endif ()
 

cmake/find/s3.cmake

@@ -1,39 +1,26 @@
 if(NOT OS_FREEBSD AND NOT APPLE AND NOT ARCH_ARM)
     option(ENABLE_S3 "Enable S3" ${ENABLE_LIBRARIES})
-elseif(ENABLE_S3 OR USE_INTERNAL_AWS_S3_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use S3 on ARM, Apple or FreeBSD")
 endif()
 
-if(NOT ENABLE_S3)
+if(ENABLE_S3)
-    if(USE_INTERNAL_AWS_S3_LIBRARY)
+    option(USE_INTERNAL_AWS_S3_LIBRARY "Set to FALSE to use system S3 instead of bundled" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal S3 library with ENABLE_S3=OFF")
-    endif()
-    return()
-endif()
 
-option(USE_INTERNAL_AWS_S3_LIBRARY "Set to FALSE to use system S3 instead of bundled" ${NOT_UNBUNDLED})
+    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3")
-if (NOT USE_INTERNAL_AWS_S3_LIBRARY)
+        message (WARNING "submodule contrib/aws is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Compilation with external S3 library is not supported yet")
+        set (MISSING_AWS_S3 1)
-endif()
-
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3")
-    message (WARNING "submodule contrib/aws is missing. to fix try run: \n git submodule update --init --recursive")
-    if (USE_INTERNAL_AWS_S3_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal S3 library")
     endif ()
-    set (MISSING_AWS_S3 1)
-endif ()
 
-if (USE_INTERNAL_AWS_S3_LIBRARY AND NOT MISSING_AWS_S3)
+    if (USE_INTERNAL_AWS_S3_LIBRARY AND NOT MISSING_AWS_S3)
-    set(AWS_S3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3/include")
+        set(AWS_S3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3/include")
-    set(AWS_S3_CORE_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core/include")
+        set(AWS_S3_CORE_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core/include")
-    set(AWS_S3_LIBRARY aws_s3)
+        set(AWS_S3_LIBRARY aws_s3)
-    set(USE_INTERNAL_AWS_S3_LIBRARY 1)
+        set(USE_INTERNAL_AWS_S3_LIBRARY 1)
-    set(USE_AWS_S3 1)
+        set(USE_AWS_S3 1)
-else()
+    else()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable S3")
+        set(USE_INTERNAL_AWS_S3_LIBRARY 0)
-    set(USE_INTERNAL_AWS_S3_LIBRARY 0)
+        set(USE_AWS_S3 0)
-    set(USE_AWS_S3 0)
+    endif ()
-endif ()
+
+endif()
 
 message (STATUS "Using aws_s3=${USE_AWS_S3}: ${AWS_S3_INCLUDE_DIR} : ${AWS_S3_LIBRARY}")

cmake/find/sentry.cmake

@@ -2,9 +2,6 @@ set (SENTRY_LIBRARY "sentry")
 set (SENTRY_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/sentry-native/include")
 if (NOT EXISTS "${SENTRY_INCLUDE_DIR}/sentry.h")
     message (WARNING "submodule contrib/sentry-native is missing. to fix try run: \n git submodule update --init --recursive")
-    if (USE_SENTRY)
-         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal sentry library")
-    endif()
     return()
 endif ()
 
@@ -19,6 +16,4 @@ if (NOT OS_FREEBSD AND NOT SPLIT_SHARED_LIBRARIES AND NOT_UNBUNDLED AND NOT (OS_
     message (STATUS "Using sentry=${USE_SENTRY}: ${SENTRY_LIBRARY}")
 
     include_directories("${SENTRY_INCLUDE_DIR}")
-elseif (USE_SENTRY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Sentry is not supported in current configuration")
 endif ()

cmake/find/simdjson.cmake

@@ -1,11 +1,8 @@
-option (USE_SIMDJSON "Use simdjson" ${ENABLE_LIBRARIES})
-
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/simdjson/include/simdjson.h")
     message (WARNING "submodule contrib/simdjson is missing. to fix try run: \n git submodule update --init --recursive")
-    if (USE_SIMDJSON)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal simdjson library")
-    endif()
     return()
 endif ()
 
+option (USE_SIMDJSON "Use simdjson" ON)
+
 message(STATUS "Using simdjson=${USE_SIMDJSON}")

cmake/find/snappy.cmake

@@ -1,21 +1,13 @@
 option(USE_SNAPPY "Enable support of snappy library" ${ENABLE_LIBRARIES})
 
-if(NOT USE_SNAPPY)
+if(USE_SNAPPY)
-    if (USE_INTERNAL_SNAPPY_LIBRARY)
+    option (USE_INTERNAL_SNAPPY_LIBRARY "Set to FALSE to use system snappy library instead of bundled" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal snappy library with USE_SNAPPY=OFF")
+
+    if(NOT USE_INTERNAL_SNAPPY_LIBRARY)
+        find_library(SNAPPY_LIBRARY snappy)
+    else ()
+        set(SNAPPY_LIBRARY snappy)
     endif()
-    return()
-endif()
 
-option (USE_INTERNAL_SNAPPY_LIBRARY "Set to FALSE to use system snappy library instead of bundled" ${NOT_UNBUNDLED})
+    message (STATUS "Using snappy: ${SNAPPY_LIBRARY}")
-
+endif ()
-if(NOT USE_INTERNAL_SNAPPY_LIBRARY)
-    find_library(SNAPPY_LIBRARY snappy)
-    if (NOT SNAPPY_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system snappy library")
-    endif()
-else ()
-    set(SNAPPY_LIBRARY snappy)
-endif()
-
-message (STATUS "Using snappy: ${SNAPPY_LIBRARY}")

cmake/find/sparsehash.cmake

@@ -2,9 +2,6 @@ option (USE_INTERNAL_SPARSEHASH_LIBRARY "Set to FALSE to use system sparsehash l
 
 if (NOT USE_INTERNAL_SPARSEHASH_LIBRARY)
     find_path (SPARSEHASH_INCLUDE_DIR NAMES sparsehash/sparse_hash_map PATHS ${SPARSEHASH_INCLUDE_PATHS})
-    if (NOT SPARSEHASH_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system sparsehash library")
-    endif ()
 endif ()
 
 if (SPARSEHASH_INCLUDE_DIR)

cmake/find/ssl.cmake

@@ -1,18 +1,12 @@
 option(ENABLE_SSL "Enable ssl" ${ENABLE_LIBRARIES})
 
-if(NOT ENABLE_SSL)
+if(ENABLE_SSL)
-    if (USE_INTERNAL_SSL_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal ssl library with ENABLE_SSL=OFF")
-    endif()
-    return()
-endif()
 
 option(USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${NOT_UNBUNDLED})
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/openssl/README")
     if(USE_INTERNAL_SSL_LIBRARY)
         message(WARNING "submodule contrib/openssl is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ssl library")
     endif()
     set(USE_INTERNAL_SSL_LIBRARY 0)
     set(MISSING_INTERNAL_SSL_LIBRARY 1)
@@ -42,10 +36,6 @@ if (NOT USE_INTERNAL_SSL_LIBRARY)
             set (OPENSSL_FOUND 1)
         endif ()
     endif ()
-
-    if (NOT OPENSSL_FOUND)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system ssl")
-    endif()
 endif ()
 
 if (NOT OPENSSL_FOUND AND NOT MISSING_INTERNAL_SSL_LIBRARY)
@@ -133,4 +123,7 @@ if(OPENSSL_FOUND AND NOT USE_INTERNAL_SSL_LIBRARY)
   endif()
 endif()
 
+
+endif ()
+
 message (STATUS "Using ssl=${USE_SSL}: ${OPENSSL_INCLUDE_DIR} : ${OPENSSL_LIBRARIES}")

cmake/find/stats.cmake

@@ -14,10 +14,6 @@ if (ENABLE_STATS)
         set(GCEM_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/gcem/include)
         set (USE_STATS 1)
     endif()
-
-    if (NOT USE_STATS)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable stats library")
-    endif()
 endif()
 
 message (STATUS "Using stats=${USE_STATS} : ${STATS_INCLUDE_DIR}")

cmake/find/termcap.cmake

@@ -5,7 +5,4 @@ endif()
 if (NOT TERMCAP_LIBRARY)
     find_library (TERMCAP_LIBRARY termcap)
 endif()
-if (NOT TERMCAP_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find tinfo, ncurses or termcap library")
-endif()
 message (STATUS "Using termcap: ${TERMCAP_LIBRARY}")

cmake/find/zlib.cmake

@@ -6,14 +6,12 @@ else ()
     set (INTERNAL_ZLIB_NAME "zlib" CACHE INTERNAL "")
     if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}")
         message (WARNING "Will use standard zlib, please clone manually:\n git clone https://github.com/madler/zlib.git ${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal zlib library")
     endif ()
 endif ()
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}/zlib.h")
     if(USE_INTERNAL_ZLIB_LIBRARY)
         message(WARNING "submodule contrib/${INTERNAL_ZLIB_NAME} is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal zlib library")
     endif()
     set(USE_INTERNAL_ZLIB_LIBRARY 0)
     set(MISSING_INTERNAL_ZLIB_LIBRARY 1)
@@ -21,7 +19,6 @@ endif()
 
 if (NOT USE_INTERNAL_ZLIB_LIBRARY)
     find_package (ZLIB)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system zlib library")
 endif ()
 
 if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)

cmake/find/zstd.cmake

@@ -3,18 +3,14 @@ option (USE_INTERNAL_ZSTD_LIBRARY "Set to FALSE to use system zstd library inste
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/zstd/lib/zstd.h")
     if(USE_INTERNAL_ZSTD_LIBRARY)
         message(WARNING "submodule contrib/zstd is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal zstd library")
-        set(USE_INTERNAL_ZSTD_LIBRARY 0)
     endif()
+    set(USE_INTERNAL_ZSTD_LIBRARY 0)
     set(MISSING_INTERNAL_ZSTD_LIBRARY 1)
 endif()
 
 if (NOT USE_INTERNAL_ZSTD_LIBRARY)
     find_library (ZSTD_LIBRARY zstd)
     find_path (ZSTD_INCLUDE_DIR NAMES zstd.h PATHS ${ZSTD_INCLUDE_PATHS})
-    if (NOT ZSTD_LIBRARY OR NOT ZSTD_INCLUDE_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system zstd library")
-    endif ()
 endif ()
 
 if (ZSTD_LIBRARY AND ZSTD_INCLUDE_DIR)

cmake/tools.cmake

@@ -41,23 +41,25 @@ STRING(REGEX MATCHALL "[0-9]+" COMPILER_VERSION_LIST ${CMAKE_CXX_COMPILER_VERSIO
 LIST(GET COMPILER_VERSION_LIST 0 COMPILER_VERSION_MAJOR)
 
 option (LINKER_NAME "Linker name or full path")
-if (COMPILER_GCC AND NOT LINKER_NAME)
+if (COMPILER_GCC)
     find_program (LLD_PATH NAMES "ld.lld")
     find_program (GOLD_PATH NAMES "ld.gold")
-elseif (NOT LINKER_NAME)
+else ()
     find_program (LLD_PATH NAMES "ld.lld-${COMPILER_VERSION_MAJOR}" "lld-${COMPILER_VERSION_MAJOR}" "ld.lld" "lld")
     find_program (GOLD_PATH NAMES "ld.gold" "gold")
 endif ()
 
-if (OS_LINUX AND NOT LINKER_NAME)
+if (OS_LINUX)
     # We prefer LLD linker over Gold or BFD on Linux.
-    if (LLD_PATH)
+    if (NOT LINKER_NAME)
-        if (COMPILER_GCC)
+        if (LLD_PATH)
-            # GCC driver requires one of supported linker names like "lld".
+            if (COMPILER_GCC)
-            set (LINKER_NAME "lld")
+                # GCC driver requires one of supported linker names like "lld".
-        else ()
+                set (LINKER_NAME "lld")
-            # Clang driver simply allows full linker path.
+            else ()
-            set (LINKER_NAME ${LLD_PATH})
+                # Clang driver simply allows full linker path.
+                set (LINKER_NAME ${LLD_PATH})
+            endif ()
         endif ()
     endif ()
 

contrib/arrow-cmake/CMakeLists.txt

@@ -80,7 +80,7 @@ set(FLATBUFFERS_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/flatbuffers)
 set(FLATBUFFERS_INCLUDE_DIR ${FLATBUFFERS_SRC_DIR}/include)
 
 # set flatbuffers CMake options
-if (MAKE_STATIC_LIBRARIES)
+if (${USE_STATIC_LIBRARIES})
     set(FLATBUFFERS_BUILD_FLATLIB ON CACHE BOOL "Enable the build of the flatbuffers library")
     set(FLATBUFFERS_BUILD_SHAREDLIB OFF CACHE BOOL "Disable the build of the flatbuffers shared library")
 else ()

contrib/boost-cmake/CMakeLists.txt

@@ -1,52 +1,6 @@
 option (USE_INTERNAL_BOOST_LIBRARY "Use internal Boost library" ${NOT_UNBUNDLED})
 
-if (NOT USE_INTERNAL_BOOST_LIBRARY)
+if (USE_INTERNAL_BOOST_LIBRARY)
-    # 1.70 like in contrib/boost
-    # 1.67 on CI
-    set(BOOST_VERSION 1.67)
-
-    find_package(Boost ${BOOST_VERSION} COMPONENTS
-        system
-        filesystem
-        iostreams
-        program_options
-        regex
-    )
-
-    if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND Boost_FILESYSTEM_LIBRARY AND
-       Boost_PROGRAM_OPTIONS_LIBRARY AND Boost_REGEX_LIBRARY AND Boost_SYSTEM_LIBRARY)
-
-        set(EXTERNAL_BOOST_FOUND 1)
-
-        add_library (_boost_headers_only INTERFACE)
-        add_library (boost::headers_only ALIAS _boost_headers_only)
-        target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${Boost_INCLUDE_DIR})
-
-        add_library (_boost_filesystem INTERFACE)
-        add_library (_boost_iostreams INTERFACE)
-        add_library (_boost_program_options INTERFACE)
-        add_library (_boost_regex INTERFACE)
-        add_library (_boost_system INTERFACE)
-
-        target_link_libraries (_boost_filesystem INTERFACE ${Boost_FILESYSTEM_LIBRARY})
-        target_link_libraries (_boost_iostreams INTERFACE ${Boost_IOSTREAMS_LIBRARY})
-        target_link_libraries (_boost_program_options INTERFACE ${Boost_PROGRAM_OPTIONS_LIBRARY})
-        target_link_libraries (_boost_regex INTERFACE ${Boost_REGEX_LIBRARY})
-        target_link_libraries (_boost_system INTERFACE ${Boost_SYSTEM_LIBRARY})
-
-        add_library (boost::filesystem ALIAS _boost_filesystem)
-        add_library (boost::iostreams ALIAS _boost_iostreams)
-        add_library (boost::program_options ALIAS _boost_program_options)
-        add_library (boost::regex ALIAS _boost_regex)
-        add_library (boost::system ALIAS _boost_system)
-    else()
-        set(EXTERNAL_BOOST_FOUND 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system boost")
-    endif()
-endif()
-
-if (NOT EXTERNAL_BOOST_FOUND)
-    set (USE_INTERNAL_BOOST_LIBRARY 1)
     set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
 
     # filesystem
@@ -142,4 +96,38 @@ if (NOT EXTERNAL_BOOST_FOUND)
     add_library (_boost_system ${SRCS_SYSTEM})
     add_library (boost::system ALIAS _boost_system)
     target_include_directories (_boost_system PRIVATE ${LIBRARY_DIR})
+else ()
+    # 1.70 like in contrib/boost
+    # 1.67 on CI
+    set(BOOST_VERSION 1.67)
+
+    find_package(Boost ${BOOST_VERSION} COMPONENTS
+        system
+        filesystem
+        iostreams
+        program_options
+        regex
+    REQUIRED)
+
+    add_library (_boost_headers_only INTERFACE)
+    add_library (boost::headers_only ALIAS _boost_headers_only)
+    target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${Boost_INCLUDE_DIR})
+
+    add_library (_boost_filesystem INTERFACE)
+    add_library (_boost_iostreams INTERFACE)
+    add_library (_boost_program_options INTERFACE)
+    add_library (_boost_regex INTERFACE)
+    add_library (_boost_system INTERFACE)
+
+    target_link_libraries (_boost_filesystem INTERFACE ${Boost_FILESYSTEM_LIBRARY})
+    target_link_libraries (_boost_iostreams INTERFACE ${Boost_IOSTREAMS_LIBRARY})
+    target_link_libraries (_boost_program_options INTERFACE ${Boost_PROGRAM_OPTIONS_LIBRARY})
+    target_link_libraries (_boost_regex INTERFACE ${Boost_REGEX_LIBRARY})
+    target_link_libraries (_boost_system INTERFACE ${Boost_SYSTEM_LIBRARY})
+
+    add_library (boost::filesystem ALIAS _boost_filesystem)
+    add_library (boost::iostreams ALIAS _boost_iostreams)
+    add_library (boost::program_options ALIAS _boost_program_options)
+    add_library (boost::regex ALIAS _boost_regex)
+    add_library (boost::system ALIAS _boost_system)
 endif ()

contrib/cctz-cmake/CMakeLists.txt

@@ -1,42 +1,9 @@
-option (USE_INTERNAL_CCTZ_LIBRARY "Use internal cctz library" ${NOT_UNBUNDLED})
+option (USE_INTERNAL_CCTZ "Use internal cctz library" ${NOT_UNBUNDLED})
 
-if (NOT USE_INTERNAL_CCTZ_LIBRARY)
+if (USE_INTERNAL_CCTZ)
-    find_library (LIBRARY_CCTZ cctz)
+    SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cctz)
-    find_path (INCLUDE_CCTZ NAMES cctz/civil_time.h)
 
-    if (LIBRARY_CCTZ AND INCLUDE_CCTZ)
+    SET (SRCS
-        set (EXTERNAL_CCTZ_LIBRARY_FOUND 1)
-
-        set(CMAKE_REQUIRED_LIBRARIES ${LIBRARY_CCTZ})
-        set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_CCTZ})
-        check_cxx_source_compiles(
-            "
-            #include <cctz/civil_time.h>
-            int main() {
-                cctz::civil_day date;
-            }
-            "
-            EXTERNAL_CCTZ_LIBRARY_WORKS
-        )
-
-        if (NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
-            message (${RECONFIGURE_MESSAGE_LEVEL}  "External cctz is not working: ${LIBRARY_CCTZ} ${INCLUDE_CCTZ}")
-        else()
-            add_library (cctz UNKNOWN IMPORTED)
-            set_property (TARGET cctz PROPERTY IMPORTED_LOCATION ${LIBRARY_CCTZ})
-            set_property (TARGET cctz PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_CCTZ})
-        endif()
-    else()
-        set (EXTERNAL_CCTZ_LIBRARY_FOUND 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system cctz")
-    endif()
-endif()
-
-if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
-    set(USE_INTERNAL_CCTZ_LIBRARY 1)
-    set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cctz)
-
-    set (SRCS
         ${LIBRARY_DIR}/src/civil_time_detail.cc
         ${LIBRARY_DIR}/src/time_zone_fixed.cc
         ${LIBRARY_DIR}/src/time_zone_format.cc
@@ -651,6 +618,29 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
         add_dependencies(cctz tzdata)
         target_link_libraries(cctz INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:tzdata> -Wl,${NO_WHOLE_ARCHIVE}")
     endif ()
+
+else ()
+    find_library (LIBRARY_CCTZ cctz)
+    find_path (INCLUDE_CCTZ NAMES cctz/civil_time.h)
+
+    add_library (cctz UNKNOWN IMPORTED)
+    set_property (TARGET cctz PROPERTY IMPORTED_LOCATION ${LIBRARY_CCTZ})
+    set_property (TARGET cctz PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_CCTZ})
+
+    set(CMAKE_REQUIRED_LIBRARIES cctz)
+    check_cxx_source_compiles(
+        "
+        #include <cctz/civil_time.h>
+        int main() {
+            cctz::civil_day date;
+        }
+        "
+        EXTERNAL_CCTZ_WORKS
+    )
+
+    if (NOT EXTERNAL_CCTZ_WORKS)
+        message (FATAL_ERROR "cctz is unusable: ${LIBRARY_CCTZ} ${INCLUDE_CCTZ}")
+    endif ()
 endif ()
 
 message (STATUS "Using cctz")

contrib/curl-cmake/CMakeLists.txt

@@ -1,200 +1,187 @@
 option (ENABLE_CURL "Enable curl" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_CURL)
+if (ENABLE_CURL)
+    option (USE_INTERNAL_CURL "Use internal curl library" ${NOT_UNBUNDLED})
+
     if (USE_INTERNAL_CURL)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal curl with ENABLE_CURL=OFF")
+        set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
-    endif()
-    return()
-endif()
 
-option (USE_INTERNAL_CURL "Use internal curl library" ${NOT_UNBUNDLED})
+        set (SRCS
+            ${LIBRARY_DIR}/lib/file.c
+            ${LIBRARY_DIR}/lib/timeval.c
+            ${LIBRARY_DIR}/lib/base64.c
+            ${LIBRARY_DIR}/lib/hostip.c
+            ${LIBRARY_DIR}/lib/progress.c
+            ${LIBRARY_DIR}/lib/formdata.c
+            ${LIBRARY_DIR}/lib/cookie.c
+            ${LIBRARY_DIR}/lib/http.c
+            ${LIBRARY_DIR}/lib/sendf.c
+            ${LIBRARY_DIR}/lib/url.c
+            ${LIBRARY_DIR}/lib/dict.c
+            ${LIBRARY_DIR}/lib/if2ip.c
+            ${LIBRARY_DIR}/lib/speedcheck.c
+            ${LIBRARY_DIR}/lib/ldap.c
+            ${LIBRARY_DIR}/lib/version.c
+            ${LIBRARY_DIR}/lib/getenv.c
+            ${LIBRARY_DIR}/lib/escape.c
+            ${LIBRARY_DIR}/lib/mprintf.c
+            ${LIBRARY_DIR}/lib/telnet.c
+            ${LIBRARY_DIR}/lib/netrc.c
+            ${LIBRARY_DIR}/lib/getinfo.c
+            ${LIBRARY_DIR}/lib/transfer.c
+            ${LIBRARY_DIR}/lib/strcase.c
+            ${LIBRARY_DIR}/lib/easy.c
+            ${LIBRARY_DIR}/lib/security.c
+            ${LIBRARY_DIR}/lib/curl_fnmatch.c
+            ${LIBRARY_DIR}/lib/fileinfo.c
+            ${LIBRARY_DIR}/lib/wildcard.c
+            ${LIBRARY_DIR}/lib/krb5.c
+            ${LIBRARY_DIR}/lib/memdebug.c
+            ${LIBRARY_DIR}/lib/http_chunks.c
+            ${LIBRARY_DIR}/lib/strtok.c
+            ${LIBRARY_DIR}/lib/connect.c
+            ${LIBRARY_DIR}/lib/llist.c
+            ${LIBRARY_DIR}/lib/hash.c
+            ${LIBRARY_DIR}/lib/multi.c
+            ${LIBRARY_DIR}/lib/content_encoding.c
+            ${LIBRARY_DIR}/lib/share.c
+            ${LIBRARY_DIR}/lib/http_digest.c
+            ${LIBRARY_DIR}/lib/md4.c
+            ${LIBRARY_DIR}/lib/md5.c
+            ${LIBRARY_DIR}/lib/http_negotiate.c
+            ${LIBRARY_DIR}/lib/inet_pton.c
+            ${LIBRARY_DIR}/lib/strtoofft.c
+            ${LIBRARY_DIR}/lib/strerror.c
+            ${LIBRARY_DIR}/lib/amigaos.c
+            ${LIBRARY_DIR}/lib/hostasyn.c
+            ${LIBRARY_DIR}/lib/hostip4.c
+            ${LIBRARY_DIR}/lib/hostip6.c
+            ${LIBRARY_DIR}/lib/hostsyn.c
+            ${LIBRARY_DIR}/lib/inet_ntop.c
+            ${LIBRARY_DIR}/lib/parsedate.c
+            ${LIBRARY_DIR}/lib/select.c
+            ${LIBRARY_DIR}/lib/splay.c
+            ${LIBRARY_DIR}/lib/strdup.c
+            ${LIBRARY_DIR}/lib/socks.c
+            ${LIBRARY_DIR}/lib/curl_addrinfo.c
+            ${LIBRARY_DIR}/lib/socks_gssapi.c
+            ${LIBRARY_DIR}/lib/socks_sspi.c
+            ${LIBRARY_DIR}/lib/curl_sspi.c
+            ${LIBRARY_DIR}/lib/slist.c
+            ${LIBRARY_DIR}/lib/nonblock.c
+            ${LIBRARY_DIR}/lib/curl_memrchr.c
+            ${LIBRARY_DIR}/lib/imap.c
+            ${LIBRARY_DIR}/lib/pop3.c
+            ${LIBRARY_DIR}/lib/smtp.c
+            ${LIBRARY_DIR}/lib/pingpong.c
+            ${LIBRARY_DIR}/lib/rtsp.c
+            ${LIBRARY_DIR}/lib/curl_threads.c
+            ${LIBRARY_DIR}/lib/warnless.c
+            ${LIBRARY_DIR}/lib/hmac.c
+            ${LIBRARY_DIR}/lib/curl_rtmp.c
+            ${LIBRARY_DIR}/lib/openldap.c
+            ${LIBRARY_DIR}/lib/curl_gethostname.c
+            ${LIBRARY_DIR}/lib/gopher.c
+            ${LIBRARY_DIR}/lib/idn_win32.c
+            ${LIBRARY_DIR}/lib/http_proxy.c
+            ${LIBRARY_DIR}/lib/non-ascii.c
+            ${LIBRARY_DIR}/lib/asyn-thread.c
+            ${LIBRARY_DIR}/lib/curl_gssapi.c
+            ${LIBRARY_DIR}/lib/http_ntlm.c
+            ${LIBRARY_DIR}/lib/curl_ntlm_wb.c
+            ${LIBRARY_DIR}/lib/curl_ntlm_core.c
+            ${LIBRARY_DIR}/lib/curl_sasl.c
+            ${LIBRARY_DIR}/lib/rand.c
+            ${LIBRARY_DIR}/lib/curl_multibyte.c
+            ${LIBRARY_DIR}/lib/hostcheck.c
+            ${LIBRARY_DIR}/lib/conncache.c
+            ${LIBRARY_DIR}/lib/dotdot.c
+            ${LIBRARY_DIR}/lib/x509asn1.c
+            ${LIBRARY_DIR}/lib/http2.c
+            ${LIBRARY_DIR}/lib/smb.c
+            ${LIBRARY_DIR}/lib/curl_endian.c
+            ${LIBRARY_DIR}/lib/curl_des.c
+            ${LIBRARY_DIR}/lib/system_win32.c
+            ${LIBRARY_DIR}/lib/mime.c
+            ${LIBRARY_DIR}/lib/sha256.c
+            ${LIBRARY_DIR}/lib/setopt.c
+            ${LIBRARY_DIR}/lib/curl_path.c
+            ${LIBRARY_DIR}/lib/curl_ctype.c
+            ${LIBRARY_DIR}/lib/curl_range.c
+            ${LIBRARY_DIR}/lib/psl.c
+            ${LIBRARY_DIR}/lib/doh.c
+            ${LIBRARY_DIR}/lib/urlapi.c
+            ${LIBRARY_DIR}/lib/curl_get_line.c
+            ${LIBRARY_DIR}/lib/altsvc.c
+            ${LIBRARY_DIR}/lib/socketpair.c
+            ${LIBRARY_DIR}/lib/vauth/vauth.c
+            ${LIBRARY_DIR}/lib/vauth/cleartext.c
+            ${LIBRARY_DIR}/lib/vauth/cram.c
+            ${LIBRARY_DIR}/lib/vauth/digest.c
+            ${LIBRARY_DIR}/lib/vauth/digest_sspi.c
+            ${LIBRARY_DIR}/lib/vauth/krb5_gssapi.c
+            ${LIBRARY_DIR}/lib/vauth/krb5_sspi.c
+            ${LIBRARY_DIR}/lib/vauth/ntlm.c
+            ${LIBRARY_DIR}/lib/vauth/ntlm_sspi.c
+            ${LIBRARY_DIR}/lib/vauth/oauth2.c
+            ${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c
+            ${LIBRARY_DIR}/lib/vauth/spnego_sspi.c
+            ${LIBRARY_DIR}/lib/vtls/openssl.c
+            ${LIBRARY_DIR}/lib/vtls/gtls.c
+            ${LIBRARY_DIR}/lib/vtls/vtls.c
+            ${LIBRARY_DIR}/lib/vtls/nss.c
+            ${LIBRARY_DIR}/lib/vtls/polarssl.c
+            ${LIBRARY_DIR}/lib/vtls/polarssl_threadlock.c
+            ${LIBRARY_DIR}/lib/vtls/wolfssl.c
+            ${LIBRARY_DIR}/lib/vtls/schannel.c
+            ${LIBRARY_DIR}/lib/vtls/schannel_verify.c
+            ${LIBRARY_DIR}/lib/vtls/sectransp.c
+            ${LIBRARY_DIR}/lib/vtls/gskit.c
+            ${LIBRARY_DIR}/lib/vtls/mbedtls.c
+            ${LIBRARY_DIR}/lib/vtls/mesalink.c
+            ${LIBRARY_DIR}/lib/vtls/bearssl.c
+            ${LIBRARY_DIR}/lib/vquic/ngtcp2.c
+            ${LIBRARY_DIR}/lib/vquic/quiche.c
+            ${LIBRARY_DIR}/lib/vssh/libssh2.c
+            ${LIBRARY_DIR}/lib/vssh/libssh.c
+        )
 
-if (NOT USE_INTERNAL_CURL)
+        add_library (curl ${SRCS})
-    find_package (CURL)
-    if (NOT CURL_FOUND)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system curl")
-    endif()
-endif()
 
-if (NOT CURL_FOUND)
+        target_compile_definitions (curl PRIVATE
-    set (USE_INTERNAL_CURL 1)
+            HAVE_CONFIG_H
-    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
+            BUILDING_LIBCURL
+            CURL_HIDDEN_SYMBOLS
+            libcurl_EXPORTS
+            OS="${CMAKE_SYSTEM_NAME}"
+        )
+        target_include_directories (curl PUBLIC
+            ${LIBRARY_DIR}/include
+            ${LIBRARY_DIR}/lib
+            . # curl_config.h
+        )
 
-    set (SRCS
+        target_link_libraries (curl PRIVATE ssl)
-        ${LIBRARY_DIR}/lib/file.c
-        ${LIBRARY_DIR}/lib/timeval.c
-        ${LIBRARY_DIR}/lib/base64.c
-        ${LIBRARY_DIR}/lib/hostip.c
-        ${LIBRARY_DIR}/lib/progress.c
-        ${LIBRARY_DIR}/lib/formdata.c
-        ${LIBRARY_DIR}/lib/cookie.c
-        ${LIBRARY_DIR}/lib/http.c
-        ${LIBRARY_DIR}/lib/sendf.c
-        ${LIBRARY_DIR}/lib/url.c
-        ${LIBRARY_DIR}/lib/dict.c
-        ${LIBRARY_DIR}/lib/if2ip.c
-        ${LIBRARY_DIR}/lib/speedcheck.c
-        ${LIBRARY_DIR}/lib/ldap.c
-        ${LIBRARY_DIR}/lib/version.c
-        ${LIBRARY_DIR}/lib/getenv.c
-        ${LIBRARY_DIR}/lib/escape.c
-        ${LIBRARY_DIR}/lib/mprintf.c
-        ${LIBRARY_DIR}/lib/telnet.c
-        ${LIBRARY_DIR}/lib/netrc.c
-        ${LIBRARY_DIR}/lib/getinfo.c
-        ${LIBRARY_DIR}/lib/transfer.c
-        ${LIBRARY_DIR}/lib/strcase.c
-        ${LIBRARY_DIR}/lib/easy.c
-        ${LIBRARY_DIR}/lib/security.c
-        ${LIBRARY_DIR}/lib/curl_fnmatch.c
-        ${LIBRARY_DIR}/lib/fileinfo.c
-        ${LIBRARY_DIR}/lib/wildcard.c
-        ${LIBRARY_DIR}/lib/krb5.c
-        ${LIBRARY_DIR}/lib/memdebug.c
-        ${LIBRARY_DIR}/lib/http_chunks.c
-        ${LIBRARY_DIR}/lib/strtok.c
-        ${LIBRARY_DIR}/lib/connect.c
-        ${LIBRARY_DIR}/lib/llist.c
-        ${LIBRARY_DIR}/lib/hash.c
-        ${LIBRARY_DIR}/lib/multi.c
-        ${LIBRARY_DIR}/lib/content_encoding.c
-        ${LIBRARY_DIR}/lib/share.c
-        ${LIBRARY_DIR}/lib/http_digest.c
-        ${LIBRARY_DIR}/lib/md4.c
-        ${LIBRARY_DIR}/lib/md5.c
-        ${LIBRARY_DIR}/lib/http_negotiate.c
-        ${LIBRARY_DIR}/lib/inet_pton.c
-        ${LIBRARY_DIR}/lib/strtoofft.c
-        ${LIBRARY_DIR}/lib/strerror.c
-        ${LIBRARY_DIR}/lib/amigaos.c
-        ${LIBRARY_DIR}/lib/hostasyn.c
-        ${LIBRARY_DIR}/lib/hostip4.c
-        ${LIBRARY_DIR}/lib/hostip6.c
-        ${LIBRARY_DIR}/lib/hostsyn.c
-        ${LIBRARY_DIR}/lib/inet_ntop.c
-        ${LIBRARY_DIR}/lib/parsedate.c
-        ${LIBRARY_DIR}/lib/select.c
-        ${LIBRARY_DIR}/lib/splay.c
-        ${LIBRARY_DIR}/lib/strdup.c
-        ${LIBRARY_DIR}/lib/socks.c
-        ${LIBRARY_DIR}/lib/curl_addrinfo.c
-        ${LIBRARY_DIR}/lib/socks_gssapi.c
-        ${LIBRARY_DIR}/lib/socks_sspi.c
-        ${LIBRARY_DIR}/lib/curl_sspi.c
-        ${LIBRARY_DIR}/lib/slist.c
-        ${LIBRARY_DIR}/lib/nonblock.c
-        ${LIBRARY_DIR}/lib/curl_memrchr.c
-        ${LIBRARY_DIR}/lib/imap.c
-        ${LIBRARY_DIR}/lib/pop3.c
-        ${LIBRARY_DIR}/lib/smtp.c
-        ${LIBRARY_DIR}/lib/pingpong.c
-        ${LIBRARY_DIR}/lib/rtsp.c
-        ${LIBRARY_DIR}/lib/curl_threads.c
-        ${LIBRARY_DIR}/lib/warnless.c
-        ${LIBRARY_DIR}/lib/hmac.c
-        ${LIBRARY_DIR}/lib/curl_rtmp.c
-        ${LIBRARY_DIR}/lib/openldap.c
-        ${LIBRARY_DIR}/lib/curl_gethostname.c
-        ${LIBRARY_DIR}/lib/gopher.c
-        ${LIBRARY_DIR}/lib/idn_win32.c
-        ${LIBRARY_DIR}/lib/http_proxy.c
-        ${LIBRARY_DIR}/lib/non-ascii.c
-        ${LIBRARY_DIR}/lib/asyn-thread.c
-        ${LIBRARY_DIR}/lib/curl_gssapi.c
-        ${LIBRARY_DIR}/lib/http_ntlm.c
-        ${LIBRARY_DIR}/lib/curl_ntlm_wb.c
-        ${LIBRARY_DIR}/lib/curl_ntlm_core.c
-        ${LIBRARY_DIR}/lib/curl_sasl.c
-        ${LIBRARY_DIR}/lib/rand.c
-        ${LIBRARY_DIR}/lib/curl_multibyte.c
-        ${LIBRARY_DIR}/lib/hostcheck.c
-        ${LIBRARY_DIR}/lib/conncache.c
-        ${LIBRARY_DIR}/lib/dotdot.c
-        ${LIBRARY_DIR}/lib/x509asn1.c
-        ${LIBRARY_DIR}/lib/http2.c
-        ${LIBRARY_DIR}/lib/smb.c
-        ${LIBRARY_DIR}/lib/curl_endian.c
-        ${LIBRARY_DIR}/lib/curl_des.c
-        ${LIBRARY_DIR}/lib/system_win32.c
-        ${LIBRARY_DIR}/lib/mime.c
-        ${LIBRARY_DIR}/lib/sha256.c
-        ${LIBRARY_DIR}/lib/setopt.c
-        ${LIBRARY_DIR}/lib/curl_path.c
-        ${LIBRARY_DIR}/lib/curl_ctype.c
-        ${LIBRARY_DIR}/lib/curl_range.c
-        ${LIBRARY_DIR}/lib/psl.c
-        ${LIBRARY_DIR}/lib/doh.c
-        ${LIBRARY_DIR}/lib/urlapi.c
-        ${LIBRARY_DIR}/lib/curl_get_line.c
-        ${LIBRARY_DIR}/lib/altsvc.c
-        ${LIBRARY_DIR}/lib/socketpair.c
-        ${LIBRARY_DIR}/lib/vauth/vauth.c
-        ${LIBRARY_DIR}/lib/vauth/cleartext.c
-        ${LIBRARY_DIR}/lib/vauth/cram.c
-        ${LIBRARY_DIR}/lib/vauth/digest.c
-        ${LIBRARY_DIR}/lib/vauth/digest_sspi.c
-        ${LIBRARY_DIR}/lib/vauth/krb5_gssapi.c
-        ${LIBRARY_DIR}/lib/vauth/krb5_sspi.c
-        ${LIBRARY_DIR}/lib/vauth/ntlm.c
-        ${LIBRARY_DIR}/lib/vauth/ntlm_sspi.c
-        ${LIBRARY_DIR}/lib/vauth/oauth2.c
-        ${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c
-        ${LIBRARY_DIR}/lib/vauth/spnego_sspi.c
-        ${LIBRARY_DIR}/lib/vtls/openssl.c
-        ${LIBRARY_DIR}/lib/vtls/gtls.c
-        ${LIBRARY_DIR}/lib/vtls/vtls.c
-        ${LIBRARY_DIR}/lib/vtls/nss.c
-        ${LIBRARY_DIR}/lib/vtls/polarssl.c
-        ${LIBRARY_DIR}/lib/vtls/polarssl_threadlock.c
-        ${LIBRARY_DIR}/lib/vtls/wolfssl.c
-        ${LIBRARY_DIR}/lib/vtls/schannel.c
-        ${LIBRARY_DIR}/lib/vtls/schannel_verify.c
-        ${LIBRARY_DIR}/lib/vtls/sectransp.c
-        ${LIBRARY_DIR}/lib/vtls/gskit.c
-        ${LIBRARY_DIR}/lib/vtls/mbedtls.c
-        ${LIBRARY_DIR}/lib/vtls/mesalink.c
-        ${LIBRARY_DIR}/lib/vtls/bearssl.c
-        ${LIBRARY_DIR}/lib/vquic/ngtcp2.c
-        ${LIBRARY_DIR}/lib/vquic/quiche.c
-        ${LIBRARY_DIR}/lib/vssh/libssh2.c
-        ${LIBRARY_DIR}/lib/vssh/libssh.c
-    )
 
-    add_library (curl ${SRCS})
+        # The library is large - avoid bloat (XXX: is it?)
+        target_compile_options (curl PRIVATE -g0)
 
-    target_compile_definitions (curl PRIVATE
+        # find_package(CURL) compatibility for the following packages that uses
-        HAVE_CONFIG_H
+        # find_package(CURL)/include(FindCURL):
-        BUILDING_LIBCURL
+        # - mariadb-connector-c
-        CURL_HIDDEN_SYMBOLS
+        # - aws-s3-cmake
-        libcurl_EXPORTS
+        # - sentry-native
-        OS="${CMAKE_SYSTEM_NAME}"
+        set (CURL_FOUND ON CACHE BOOL "")
-    )
+        set (CURL_ROOT_DIR ${LIBRARY_DIR} CACHE PATH "")
-    target_include_directories (curl PUBLIC
+        set (CURL_INCLUDE_DIR ${LIBRARY_DIR}/include CACHE PATH "")
-        ${LIBRARY_DIR}/include
+        set (CURL_INCLUDE_DIRS ${LIBRARY_DIR}/include CACHE PATH "")
-        ${LIBRARY_DIR}/lib
+        set (CURL_LIBRARY curl CACHE STRING "")
-        . # curl_config.h
+        set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
-    )
+        set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
-
+        add_library (CURL::libcurl ALIAS ${CURL_LIBRARY})
-    target_link_libraries (curl PRIVATE ssl)
+    else ()
-
+        find_package (CURL REQUIRED)
-    # The library is large - avoid bloat (XXX: is it?)
+    endif ()
-    target_compile_options (curl PRIVATE -g0)
-
-    # find_package(CURL) compatibility for the following packages that uses
-    # find_package(CURL)/include(FindCURL):
-    # - mariadb-connector-c
-    # - aws-s3-cmake
-    # - sentry-native
-    set (CURL_FOUND ON CACHE BOOL "")
-    set (CURL_ROOT_DIR ${LIBRARY_DIR} CACHE PATH "")
-    set (CURL_INCLUDE_DIR ${LIBRARY_DIR}/include CACHE PATH "")
-    set (CURL_INCLUDE_DIRS ${LIBRARY_DIR}/include CACHE PATH "")
-    set (CURL_LIBRARY curl CACHE STRING "")
-    set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
-    set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
-    add_library (CURL::libcurl ALIAS ${CURL_LIBRARY})
-
-    set (USE_INTERNAL_CURL 1)
 endif ()
 
 message (STATUS "Using curl: ${CURL_INCLUDE_DIRS} : ${CURL_LIBRARIES}")

contrib/hyperscan-cmake/CMakeLists.txt

@@ -1,272 +1,252 @@
-if (HAVE_SSSE3)
+option (ENABLE_HYPERSCAN "Enable hyperscan library" ${ENABLE_LIBRARIES})
-    option (ENABLE_HYPERSCAN "Enable hyperscan library" ${ENABLE_LIBRARIES})
+
-elseif(ENABLE_HYPERSCAN)
+if (NOT HAVE_SSSE3)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use hyperscan without SSSE3")
     set (ENABLE_HYPERSCAN OFF)
 endif ()
 
-if (NOT ENABLE_HYPERSCAN)
+if (ENABLE_HYPERSCAN)
+    option (USE_INTERNAL_HYPERSCAN_LIBRARY "Use internal hyperscan library" ${NOT_UNBUNDLED})
+
     if (USE_INTERNAL_HYPERSCAN_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal hyperscan with ENABLE_HYPERSCAN=OFF")
+        set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/hyperscan)
-    endif()
 
-    add_library (hyperscan INTERFACE)
+        set (SRCS
-    target_compile_definitions (hyperscan INTERFACE USE_HYPERSCAN=0)
+            ${LIBRARY_DIR}/src/alloc.c
+            ${LIBRARY_DIR}/src/compiler/asserts.cpp
+            ${LIBRARY_DIR}/src/compiler/compiler.cpp
+            ${LIBRARY_DIR}/src/compiler/error.cpp
+            ${LIBRARY_DIR}/src/crc32.c
+            ${LIBRARY_DIR}/src/database.c
+            ${LIBRARY_DIR}/src/fdr/engine_description.cpp
+            ${LIBRARY_DIR}/src/fdr/fdr_compile_util.cpp
+            ${LIBRARY_DIR}/src/fdr/fdr_compile.cpp
+            ${LIBRARY_DIR}/src/fdr/fdr_confirm_compile.cpp
+            ${LIBRARY_DIR}/src/fdr/fdr_engine_description.cpp
+            ${LIBRARY_DIR}/src/fdr/fdr.c
+            ${LIBRARY_DIR}/src/fdr/flood_compile.cpp
+            ${LIBRARY_DIR}/src/fdr/teddy_compile.cpp
+            ${LIBRARY_DIR}/src/fdr/teddy_engine_description.cpp
+            ${LIBRARY_DIR}/src/fdr/teddy.c
+            ${LIBRARY_DIR}/src/grey.cpp
+            ${LIBRARY_DIR}/src/hs_valid_platform.c
+            ${LIBRARY_DIR}/src/hs_version.c
+            ${LIBRARY_DIR}/src/hs.cpp
+            ${LIBRARY_DIR}/src/hwlm/hwlm_build.cpp
+            ${LIBRARY_DIR}/src/hwlm/hwlm_literal.cpp
+            ${LIBRARY_DIR}/src/hwlm/hwlm.c
+            ${LIBRARY_DIR}/src/hwlm/noodle_build.cpp
+            ${LIBRARY_DIR}/src/hwlm/noodle_engine.c
+            ${LIBRARY_DIR}/src/nfa/accel_dfa_build_strat.cpp
+            ${LIBRARY_DIR}/src/nfa/accel.c
+            ${LIBRARY_DIR}/src/nfa/accelcompile.cpp
+            ${LIBRARY_DIR}/src/nfa/castle.c
+            ${LIBRARY_DIR}/src/nfa/castlecompile.cpp
+            ${LIBRARY_DIR}/src/nfa/dfa_build_strat.cpp
+            ${LIBRARY_DIR}/src/nfa/dfa_min.cpp
+            ${LIBRARY_DIR}/src/nfa/gough.c
+            ${LIBRARY_DIR}/src/nfa/goughcompile_accel.cpp
+            ${LIBRARY_DIR}/src/nfa/goughcompile_reg.cpp
+            ${LIBRARY_DIR}/src/nfa/goughcompile.cpp
+            ${LIBRARY_DIR}/src/nfa/lbr.c
+            ${LIBRARY_DIR}/src/nfa/limex_64.c
+            ${LIBRARY_DIR}/src/nfa/limex_accel.c
+            ${LIBRARY_DIR}/src/nfa/limex_compile.cpp
+            ${LIBRARY_DIR}/src/nfa/limex_native.c
+            ${LIBRARY_DIR}/src/nfa/limex_simd128.c
+            ${LIBRARY_DIR}/src/nfa/limex_simd256.c
+            ${LIBRARY_DIR}/src/nfa/limex_simd384.c
+            ${LIBRARY_DIR}/src/nfa/limex_simd512.c
+            ${LIBRARY_DIR}/src/nfa/mcclellan.c
+            ${LIBRARY_DIR}/src/nfa/mcclellancompile_util.cpp
+            ${LIBRARY_DIR}/src/nfa/mcclellancompile.cpp
+            ${LIBRARY_DIR}/src/nfa/mcsheng_compile.cpp
+            ${LIBRARY_DIR}/src/nfa/mcsheng_data.c
+            ${LIBRARY_DIR}/src/nfa/mcsheng.c
+            ${LIBRARY_DIR}/src/nfa/mpv.c
+            ${LIBRARY_DIR}/src/nfa/mpvcompile.cpp
+            ${LIBRARY_DIR}/src/nfa/nfa_api_dispatch.c
+            ${LIBRARY_DIR}/src/nfa/nfa_build_util.cpp
+            ${LIBRARY_DIR}/src/nfa/rdfa_graph.cpp
+            ${LIBRARY_DIR}/src/nfa/rdfa_merge.cpp
+            ${LIBRARY_DIR}/src/nfa/rdfa.cpp
+            ${LIBRARY_DIR}/src/nfa/repeat.c
+            ${LIBRARY_DIR}/src/nfa/repeatcompile.cpp
+            ${LIBRARY_DIR}/src/nfa/sheng.c
+            ${LIBRARY_DIR}/src/nfa/shengcompile.cpp
+            ${LIBRARY_DIR}/src/nfa/shufti.c
+            ${LIBRARY_DIR}/src/nfa/shufticompile.cpp
+            ${LIBRARY_DIR}/src/nfa/tamarama.c
+            ${LIBRARY_DIR}/src/nfa/tamaramacompile.cpp
+            ${LIBRARY_DIR}/src/nfa/truffle.c
+            ${LIBRARY_DIR}/src/nfa/trufflecompile.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_anchored_acyclic.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_anchored_dots.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_asserts.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_builder.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_calc_components.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_cyclic_redundancy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_depth.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_dominators.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_edge_redundancy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_equivalence.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_execute.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_expr_info.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_extparam.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_fixed_width.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_fuzzy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_haig.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_holder.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_is_equal.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_lbr.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_limex_accel.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_limex.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_literal_analysis.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_literal_component.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_literal_decorated.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_mcclellan.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_misc_opt.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_netflow.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_prefilter.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_prune.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_puff.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_redundancy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_region_redundancy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_region.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_repeat.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_reports.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_restructuring.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_revacc.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_sep.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_small_literal_set.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_som_add_redundancy.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_som_util.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_som.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_split.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_squash.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_stop.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_uncalc_components.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_utf8.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_util.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_vacuous.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_violet.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng_width.cpp
+            ${LIBRARY_DIR}/src/nfagraph/ng.cpp
+            ${LIBRARY_DIR}/src/parser/AsciiComponentClass.cpp
+            ${LIBRARY_DIR}/src/parser/buildstate.cpp
+            ${LIBRARY_DIR}/src/parser/check_refs.cpp
+            ${LIBRARY_DIR}/src/parser/Component.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentAlternation.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentAssertion.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentAtomicGroup.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentBackReference.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentBoundary.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentByte.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentClass.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentCondReference.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentEmpty.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentEUS.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentRepeat.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentSequence.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentVisitor.cpp
+            ${LIBRARY_DIR}/src/parser/ComponentWordBoundary.cpp
+            ${LIBRARY_DIR}/src/parser/ConstComponentVisitor.cpp
+            ${LIBRARY_DIR}/src/parser/control_verbs.cpp
+            ${LIBRARY_DIR}/src/parser/logical_combination.cpp
+            ${LIBRARY_DIR}/src/parser/parse_error.cpp
+            ${LIBRARY_DIR}/src/parser/parser_util.cpp
+            ${LIBRARY_DIR}/src/parser/Parser.cpp
+            ${LIBRARY_DIR}/src/parser/prefilter.cpp
+            ${LIBRARY_DIR}/src/parser/shortcut_literal.cpp
+            ${LIBRARY_DIR}/src/parser/ucp_table.cpp
+            ${LIBRARY_DIR}/src/parser/unsupported.cpp
+            ${LIBRARY_DIR}/src/parser/utf8_validate.cpp
+            ${LIBRARY_DIR}/src/parser/Utf8ComponentClass.cpp
+            ${LIBRARY_DIR}/src/rose/block.c
+            ${LIBRARY_DIR}/src/rose/catchup.c
+            ${LIBRARY_DIR}/src/rose/init.c
+            ${LIBRARY_DIR}/src/rose/match.c
+            ${LIBRARY_DIR}/src/rose/program_runtime.c
+            ${LIBRARY_DIR}/src/rose/rose_build_add_mask.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_add.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_anchored.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_bytecode.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_castle.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_compile.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_convert.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_dedupe.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_engine_blob.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_exclusive.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_groups.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_infix.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_instructions.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_lit_accel.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_long_lit.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_lookaround.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_matchers.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_merge.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_misc.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_program.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_role_aliasing.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_scatter.cpp
+            ${LIBRARY_DIR}/src/rose/rose_build_width.cpp
+            ${LIBRARY_DIR}/src/rose/rose_in_util.cpp
+            ${LIBRARY_DIR}/src/rose/stream.c
+            ${LIBRARY_DIR}/src/runtime.c
+            ${LIBRARY_DIR}/src/scratch.c
+            ${LIBRARY_DIR}/src/smallwrite/smallwrite_build.cpp
+            ${LIBRARY_DIR}/src/som/slot_manager.cpp
+            ${LIBRARY_DIR}/src/som/som_runtime.c
+            ${LIBRARY_DIR}/src/som/som_stream.c
+            ${LIBRARY_DIR}/src/stream_compress.c
+            ${LIBRARY_DIR}/src/util/alloc.cpp
+            ${LIBRARY_DIR}/src/util/charreach.cpp
+            ${LIBRARY_DIR}/src/util/clique.cpp
+            ${LIBRARY_DIR}/src/util/compile_context.cpp
+            ${LIBRARY_DIR}/src/util/compile_error.cpp
+            ${LIBRARY_DIR}/src/util/cpuid_flags.c
+            ${LIBRARY_DIR}/src/util/depth.cpp
+            ${LIBRARY_DIR}/src/util/fatbit_build.cpp
+            ${LIBRARY_DIR}/src/util/multibit_build.cpp
+            ${LIBRARY_DIR}/src/util/multibit.c
+            ${LIBRARY_DIR}/src/util/report_manager.cpp
+            ${LIBRARY_DIR}/src/util/simd_utils.c
+            ${LIBRARY_DIR}/src/util/state_compress.c
+            ${LIBRARY_DIR}/src/util/target_info.cpp
+            ${LIBRARY_DIR}/src/util/ue2string.cpp
+        )
 
-    message (STATUS "Not using hyperscan")
+        add_library (hyperscan ${SRCS})
-    return()
-endif()
 
-option (USE_INTERNAL_HYPERSCAN_LIBRARY "Use internal hyperscan library" ${NOT_UNBUNDLED})
+        target_compile_definitions (hyperscan PUBLIC USE_HYPERSCAN=1)
-
+        target_compile_options (hyperscan
-if (NOT USE_INTERNAL_HYPERSCAN_LIBRARY)
+            PRIVATE -g0 # Library has too much debug information
-    find_library (LIBRARY_HYPERSCAN hs)
+            -march=corei7 -O2 -fno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden # The options from original build system
-    find_path (INCLUDE_HYPERSCAN NAMES hs.h HINTS /usr/include/hs) # Ubuntu puts headers in this folder
+            -fno-sanitize=undefined # Assume the library takes care of itself
-
+        )
-    if (LIBRARY_HYPERSCAN AND INCLUDE_HYPERSCAN)
+        target_include_directories (hyperscan
-        set (EXTERNAL_HYPERSCAN_LIBRARY_FOUND 1)
+            PRIVATE
+                common
+                ${LIBRARY_DIR}/include
+        )
+        target_include_directories (hyperscan SYSTEM PUBLIC ${LIBRARY_DIR}/src)
+        if (ARCH_AMD64)
+            target_include_directories (hyperscan PRIVATE x86_64)
+        endif ()
+        target_link_libraries (hyperscan PRIVATE boost::headers_only)
+    else ()
+        find_library (LIBRARY_HYPERSCAN hs)
+        find_path (INCLUDE_HYPERSCAN NAMES hs.h HINTS /usr/include/hs) # Ubuntu puts headers in this folder
 
         add_library (hyperscan UNKNOWN IMPORTED GLOBAL)
         set_target_properties (hyperscan PROPERTIES IMPORTED_LOCATION ${LIBRARY_HYPERSCAN})
         set_target_properties (hyperscan PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_HYPERSCAN})
         set_property(TARGET hyperscan APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_HYPERSCAN=1)
-    else ()
-        set (EXTERNAL_HYPERSCAN_LIBRARY_FOUND 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system hyperscan library")
     endif ()
 
+    message (STATUS "Using hyperscan")
+else ()
+    add_library (hyperscan INTERFACE)
+    target_compile_definitions (hyperscan INTERFACE USE_HYPERSCAN=0)
+
+    message (STATUS "Not using hyperscan")
 endif ()
-
-if (NOT EXTERNAL_HYPERSCAN_LIBRARY_FOUND)
-    set (USE_INTERNAL_HYPERSCAN_LIBRARY 1)
-
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/hyperscan)
-
-    set (SRCS
-        ${LIBRARY_DIR}/src/alloc.c
-        ${LIBRARY_DIR}/src/compiler/asserts.cpp
-        ${LIBRARY_DIR}/src/compiler/compiler.cpp
-        ${LIBRARY_DIR}/src/compiler/error.cpp
-        ${LIBRARY_DIR}/src/crc32.c
-        ${LIBRARY_DIR}/src/database.c
-        ${LIBRARY_DIR}/src/fdr/engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_compile_util.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_confirm_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr.c
-        ${LIBRARY_DIR}/src/fdr/flood_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy_engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy.c
-        ${LIBRARY_DIR}/src/grey.cpp
-        ${LIBRARY_DIR}/src/hs_valid_platform.c
-        ${LIBRARY_DIR}/src/hs_version.c
-        ${LIBRARY_DIR}/src/hs.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm_build.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm_literal.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm.c
-        ${LIBRARY_DIR}/src/hwlm/noodle_build.cpp
-        ${LIBRARY_DIR}/src/hwlm/noodle_engine.c
-        ${LIBRARY_DIR}/src/nfa/accel_dfa_build_strat.cpp
-        ${LIBRARY_DIR}/src/nfa/accel.c
-        ${LIBRARY_DIR}/src/nfa/accelcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/castle.c
-        ${LIBRARY_DIR}/src/nfa/castlecompile.cpp
-        ${LIBRARY_DIR}/src/nfa/dfa_build_strat.cpp
-        ${LIBRARY_DIR}/src/nfa/dfa_min.cpp
-        ${LIBRARY_DIR}/src/nfa/gough.c
-        ${LIBRARY_DIR}/src/nfa/goughcompile_accel.cpp
-        ${LIBRARY_DIR}/src/nfa/goughcompile_reg.cpp
-        ${LIBRARY_DIR}/src/nfa/goughcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/lbr.c
-        ${LIBRARY_DIR}/src/nfa/limex_64.c
-        ${LIBRARY_DIR}/src/nfa/limex_accel.c
-        ${LIBRARY_DIR}/src/nfa/limex_compile.cpp
-        ${LIBRARY_DIR}/src/nfa/limex_native.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd128.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd256.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd384.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd512.c
-        ${LIBRARY_DIR}/src/nfa/mcclellan.c
-        ${LIBRARY_DIR}/src/nfa/mcclellancompile_util.cpp
-        ${LIBRARY_DIR}/src/nfa/mcclellancompile.cpp
-        ${LIBRARY_DIR}/src/nfa/mcsheng_compile.cpp
-        ${LIBRARY_DIR}/src/nfa/mcsheng_data.c
-        ${LIBRARY_DIR}/src/nfa/mcsheng.c
-        ${LIBRARY_DIR}/src/nfa/mpv.c
-        ${LIBRARY_DIR}/src/nfa/mpvcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/nfa_api_dispatch.c
-        ${LIBRARY_DIR}/src/nfa/nfa_build_util.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa_graph.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa_merge.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa.cpp
-        ${LIBRARY_DIR}/src/nfa/repeat.c
-        ${LIBRARY_DIR}/src/nfa/repeatcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/sheng.c
-        ${LIBRARY_DIR}/src/nfa/shengcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/shufti.c
-        ${LIBRARY_DIR}/src/nfa/shufticompile.cpp
-        ${LIBRARY_DIR}/src/nfa/tamarama.c
-        ${LIBRARY_DIR}/src/nfa/tamaramacompile.cpp
-        ${LIBRARY_DIR}/src/nfa/truffle.c
-        ${LIBRARY_DIR}/src/nfa/trufflecompile.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_anchored_acyclic.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_anchored_dots.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_asserts.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_builder.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_calc_components.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_cyclic_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_depth.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_dominators.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_edge_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_equivalence.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_execute.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_expr_info.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_extparam.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_fixed_width.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_fuzzy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_haig.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_holder.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_is_equal.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_lbr.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_limex_accel.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_limex.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_analysis.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_component.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_decorated.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_mcclellan.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_misc_opt.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_netflow.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_prefilter.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_prune.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_puff.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_region_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_region.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_repeat.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_reports.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_restructuring.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_revacc.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_sep.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_small_literal_set.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som_add_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som_util.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_split.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_squash.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_stop.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_uncalc_components.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_utf8.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_util.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_vacuous.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_violet.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_width.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng.cpp
-        ${LIBRARY_DIR}/src/parser/AsciiComponentClass.cpp
-        ${LIBRARY_DIR}/src/parser/buildstate.cpp
-        ${LIBRARY_DIR}/src/parser/check_refs.cpp
-        ${LIBRARY_DIR}/src/parser/Component.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAlternation.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAssertion.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAtomicGroup.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentBackReference.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentBoundary.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentByte.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentClass.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentCondReference.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentEmpty.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentEUS.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentRepeat.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentSequence.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentVisitor.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentWordBoundary.cpp
-        ${LIBRARY_DIR}/src/parser/ConstComponentVisitor.cpp
-        ${LIBRARY_DIR}/src/parser/control_verbs.cpp
-        ${LIBRARY_DIR}/src/parser/logical_combination.cpp
-        ${LIBRARY_DIR}/src/parser/parse_error.cpp
-        ${LIBRARY_DIR}/src/parser/parser_util.cpp
-        ${LIBRARY_DIR}/src/parser/Parser.cpp
-        ${LIBRARY_DIR}/src/parser/prefilter.cpp
-        ${LIBRARY_DIR}/src/parser/shortcut_literal.cpp
-        ${LIBRARY_DIR}/src/parser/ucp_table.cpp
-        ${LIBRARY_DIR}/src/parser/unsupported.cpp
-        ${LIBRARY_DIR}/src/parser/utf8_validate.cpp
-        ${LIBRARY_DIR}/src/parser/Utf8ComponentClass.cpp
-        ${LIBRARY_DIR}/src/rose/block.c
-        ${LIBRARY_DIR}/src/rose/catchup.c
-        ${LIBRARY_DIR}/src/rose/init.c
-        ${LIBRARY_DIR}/src/rose/match.c
-        ${LIBRARY_DIR}/src/rose/program_runtime.c
-        ${LIBRARY_DIR}/src/rose/rose_build_add_mask.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_add.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_anchored.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_bytecode.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_castle.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_compile.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_convert.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_dedupe.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_engine_blob.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_exclusive.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_groups.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_infix.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_instructions.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_lit_accel.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_long_lit.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_lookaround.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_matchers.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_merge.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_misc.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_program.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_role_aliasing.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_scatter.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_width.cpp
-        ${LIBRARY_DIR}/src/rose/rose_in_util.cpp
-        ${LIBRARY_DIR}/src/rose/stream.c
-        ${LIBRARY_DIR}/src/runtime.c
-        ${LIBRARY_DIR}/src/scratch.c
-        ${LIBRARY_DIR}/src/smallwrite/smallwrite_build.cpp
-        ${LIBRARY_DIR}/src/som/slot_manager.cpp
-        ${LIBRARY_DIR}/src/som/som_runtime.c
-        ${LIBRARY_DIR}/src/som/som_stream.c
-        ${LIBRARY_DIR}/src/stream_compress.c
-        ${LIBRARY_DIR}/src/util/alloc.cpp
-        ${LIBRARY_DIR}/src/util/charreach.cpp
-        ${LIBRARY_DIR}/src/util/clique.cpp
-        ${LIBRARY_DIR}/src/util/compile_context.cpp
-        ${LIBRARY_DIR}/src/util/compile_error.cpp
-        ${LIBRARY_DIR}/src/util/cpuid_flags.c
-        ${LIBRARY_DIR}/src/util/depth.cpp
-        ${LIBRARY_DIR}/src/util/fatbit_build.cpp
-        ${LIBRARY_DIR}/src/util/multibit_build.cpp
-        ${LIBRARY_DIR}/src/util/multibit.c
-        ${LIBRARY_DIR}/src/util/report_manager.cpp
-        ${LIBRARY_DIR}/src/util/simd_utils.c
-        ${LIBRARY_DIR}/src/util/state_compress.c
-        ${LIBRARY_DIR}/src/util/target_info.cpp
-        ${LIBRARY_DIR}/src/util/ue2string.cpp
-    )
-
-    add_library (hyperscan ${SRCS})
-
-    target_compile_definitions (hyperscan PUBLIC USE_HYPERSCAN=1)
-    target_compile_options (hyperscan
-        PRIVATE -g0 # Library has too much debug information
-        -march=corei7 -O2 -fno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden # The options from original build system
-        -fno-sanitize=undefined # Assume the library takes care of itself
-    )
-    target_include_directories (hyperscan
-        PRIVATE
-            common
-            ${LIBRARY_DIR}/include
-    )
-    target_include_directories (hyperscan SYSTEM PUBLIC ${LIBRARY_DIR}/src)
-    if (ARCH_AMD64)
-        target_include_directories (hyperscan PRIVATE x86_64)
-    endif ()
-    target_link_libraries (hyperscan PRIVATE boost::headers_only)
-
-    set (USE_INTERNAL_HYPERSCAN_LIBRARY 1)
-endif ()
-
-message (STATUS "Using hyperscan")

contrib/jemalloc-cmake/CMakeLists.txt

@@ -2,40 +2,140 @@ option (ENABLE_JEMALLOC "Enable jemalloc allocator" ${ENABLE_LIBRARIES})
 
 if (SANITIZE OR NOT (ARCH_AMD64 OR ARCH_ARM) OR NOT (OS_LINUX OR OS_FREEBSD OR OS_DARWIN))
     set (ENABLE_JEMALLOC OFF)
-    message (${RECONFIGURE_MESSAGE_LEVEL}
+    message (STATUS "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64 or aarch64 on linux or freebsd.")
-             "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64 or aarch64 on linux or freebsd.")
 endif ()
 
-if (NOT ENABLE_JEMALLOC)
+if (ENABLE_JEMALLOC)
-    if(USE_INTERNAL_JEMALLOC_LIBRARY)
+    if (NOT OS_LINUX)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal jemalloc with ENABLE_JEMALLOC=OFF")
+        message (WARNING "jemalloc support on non-linux is EXPERIMENTAL")
     endif()
 
-    add_library(jemalloc INTERFACE)
+    option (USE_INTERNAL_JEMALLOC "Use internal jemalloc library" ${NOT_UNBUNDLED})
-    target_compile_definitions(jemalloc INTERFACE USE_JEMALLOC=0)
 
-    message (STATUS "Not using jemalloc")
+    if (USE_INTERNAL_JEMALLOC)
-    return()
+        if (OS_LINUX)
-endif ()
+            # ThreadPool select job randomly, and there can be some threads that had been
+            # performed some memory heavy task before and will be inactive for some time,
+            # but until it will became active again, the memory will not be freed since by
+            # default each thread has it's own arena, but there should be not more then
+            # 4*CPU arenas (see opt.nareans description).
+            #
+            # By enabling percpu_arena number of arenas limited to number of CPUs and hence
+            # this problem should go away.
+            #
+            # muzzy_decay_ms -- use MADV_FREE when available on newer Linuxes, to
+            # avoid spurious latencies and additional work associated with
+            # MADV_DONTNEED. See
+            # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
+            set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:10000")
+        else()
+            set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:10000")
+        endif()
+        # CACHE variable is empty, to allow changing defaults without necessity
+        # to purge cache
+        set (JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE "" CACHE STRING "Change default configuration string of JEMalloc" )
+        if (JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE)
+            set (JEMALLOC_CONFIG_MALLOC_CONF "${JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE}")
+        endif()
+        message (STATUS "jemalloc malloc_conf: ${JEMALLOC_CONFIG_MALLOC_CONF}")
 
-if (NOT OS_LINUX)
+        set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc")
-    message (WARNING "jemalloc support on non-linux is EXPERIMENTAL")
-endif()
 
-option (USE_INTERNAL_JEMALLOC_LIBRARY "Use internal jemalloc library" ${NOT_UNBUNDLED})
+        set (SRCS
+            ${LIBRARY_DIR}/src/arena.c
+            ${LIBRARY_DIR}/src/background_thread.c
+            ${LIBRARY_DIR}/src/base.c
+            ${LIBRARY_DIR}/src/bin.c
+            ${LIBRARY_DIR}/src/bitmap.c
+            ${LIBRARY_DIR}/src/ckh.c
+            ${LIBRARY_DIR}/src/ctl.c
+            ${LIBRARY_DIR}/src/div.c
+            ${LIBRARY_DIR}/src/extent.c
+            ${LIBRARY_DIR}/src/extent_dss.c
+            ${LIBRARY_DIR}/src/extent_mmap.c
+            ${LIBRARY_DIR}/src/hash.c
+            ${LIBRARY_DIR}/src/hook.c
+            ${LIBRARY_DIR}/src/jemalloc.c
+            ${LIBRARY_DIR}/src/large.c
+            ${LIBRARY_DIR}/src/log.c
+            ${LIBRARY_DIR}/src/malloc_io.c
+            ${LIBRARY_DIR}/src/mutex.c
+            ${LIBRARY_DIR}/src/mutex_pool.c
+            ${LIBRARY_DIR}/src/nstime.c
+            ${LIBRARY_DIR}/src/pages.c
+            ${LIBRARY_DIR}/src/prng.c
+            ${LIBRARY_DIR}/src/prof.c
+            ${LIBRARY_DIR}/src/rtree.c
+            ${LIBRARY_DIR}/src/sc.c
+            ${LIBRARY_DIR}/src/stats.c
+            ${LIBRARY_DIR}/src/sz.c
+            ${LIBRARY_DIR}/src/tcache.c
+            ${LIBRARY_DIR}/src/test_hooks.c
+            ${LIBRARY_DIR}/src/ticker.c
+            ${LIBRARY_DIR}/src/tsd.c
+            ${LIBRARY_DIR}/src/witness.c
+            ${LIBRARY_DIR}/src/safety_check.c
+        )
+        if (OS_DARWIN)
+            list(APPEND SRCS ${LIBRARY_DIR}/src/zone.c)
+        endif ()
 
-if (NOT USE_INTERNAL_JEMALLOC_LIBRARY)
+        add_library(jemalloc ${SRCS})
-    find_library(LIBRARY_JEMALLOC jemalloc)
+        target_include_directories(jemalloc PRIVATE ${LIBRARY_DIR}/include)
-    find_path(INCLUDE_JEMALLOC jemalloc/jemalloc.h)
+        target_include_directories(jemalloc SYSTEM PUBLIC include)
 
-    if (LIBRARY_JEMALLOC AND INCLUDE_JEMALLOC)
+        set (JEMALLOC_INCLUDE_PREFIX)
-        set(EXTERNAL_JEMALLOC_LIBRARY_FOUND 1)
+        # OS_
+        if (OS_LINUX)
+            set (JEMALLOC_INCLUDE_PREFIX "include_linux")
+        elseif (OS_FREEBSD)
+            set (JEMALLOC_INCLUDE_PREFIX "include_freebsd")
+        elseif (OS_DARWIN)
+            set (JEMALLOC_INCLUDE_PREFIX "include_darwin")
+        else ()
+            message (FATAL_ERROR "This OS is not supported")
+        endif ()
+        # ARCH_
+        if (ARCH_AMD64)
+            set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_x86_64")
+        elseif (ARCH_ARM)
+            set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_aarch64")
+        else ()
+            message (FATAL_ERROR "This arch is not supported")
+        endif ()
+
+        configure_file(${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h.in
+            ${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h)
+        target_include_directories(jemalloc SYSTEM PRIVATE
+            ${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal)
+
+        target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
+
+        if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
+            target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1 -DJEMALLOC_PROF=1)
+
+            if (USE_UNWIND)
+                target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
+                target_link_libraries (jemalloc PRIVATE unwind)
+            endif ()
+        endif ()
+
+        target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
+        # for RTLD_NEXT
+        target_compile_options(jemalloc PRIVATE -D_GNU_SOURCE)
+    else ()
+        find_library(LIBRARY_JEMALLOC jemalloc)
+        find_path(INCLUDE_JEMALLOC jemalloc/jemalloc.h)
 
         set(THREADS_PREFER_PTHREAD_FLAG ON)
-        find_package(Threads)
+        find_package(Threads REQUIRED)
 
-        set (CMAKE_REQUIRED_LIBRARIES ${LIBRARY_JEMALLOC} Threads::Threads "dl")
+        add_library (jemalloc STATIC IMPORTED)
-        set (CMAKE_REQUIRED_INCLUDES ${INCLUDE_JEMALLOC})
+        set_property (TARGET jemalloc PROPERTY IMPORTED_LOCATION ${LIBRARY_JEMALLOC})
+        set_property (TARGET jemalloc PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_JEMALLOC})
+        set_property (TARGET jemalloc PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads dl)
+
+        set (CMAKE_REQUIRED_LIBRARIES jemalloc)
         check_cxx_source_compiles (
             "
             #include <jemalloc/jemalloc.h>
@@ -44,145 +144,24 @@ if (NOT USE_INTERNAL_JEMALLOC_LIBRARY)
                 free(mallocx(1, 0));
             }
             "
-            EXTERNAL_JEMALLOC_LIBRARY_WORKS
+            EXTERNAL_JEMALLOC_WORKS
         )
 
-        if (EXTERNAL_JEMALLOC_LIBRARY_WORKS)
+        if (NOT EXTERNAL_JEMALLOC_WORKS)
-            add_library (jemalloc STATIC IMPORTED)
+            message (FATAL_ERROR "jemalloc is unusable: ${LIBRARY_JEMALLOC} ${INCLUDE_JEMALLOC}")
-            set_property (TARGET jemalloc PROPERTY IMPORTED_LOCATION ${LIBRARY_JEMALLOC})
-            set_property (TARGET jemalloc PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_JEMALLOC})
-            set_property (TARGET jemalloc PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads dl)
-        else()
-            message (${RECONFIGURE_MESSAGE_LEVEL} "External jemalloc is unusable: ${LIBRARY_JEMALLOC} ${INCLUDE_JEMALLOC}")
-        endif ()
-
-    else()
-        set(EXTERNAL_JEMALLOC_LIBRARY_FOUND 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system jemalloc")
-    endif()
-endif ()
-
-if (NOT EXTERNAL_JEMALLOC_LIBRARY_FOUND OR NOT EXTERNAL_JEMALLOC_LIBRARY_WORKS)
-    set(USE_INTERNAL_JEMALLOC_LIBRARY 1)
-
-    if (OS_LINUX)
-        # ThreadPool select job randomly, and there can be some threads that had been
-        # performed some memory heavy task before and will be inactive for some time,
-        # but until it will became active again, the memory will not be freed since by
-        # default each thread has it's own arena, but there should be not more then
-        # 4*CPU arenas (see opt.nareans description).
-        #
-        # By enabling percpu_arena number of arenas limited to number of CPUs and hence
-        # this problem should go away.
-        #
-        # muzzy_decay_ms -- use MADV_FREE when available on newer Linuxes, to
-        # avoid spurious latencies and additional work associated with
-        # MADV_DONTNEED. See
-        # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
-        set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:10000")
-    else()
-        set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:10000")
-    endif()
-    # CACHE variable is empty, to allow changing defaults without necessity
-    # to purge cache
-    set (JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE "" CACHE STRING "Change default configuration string of JEMalloc" )
-    if (JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE)
-        set (JEMALLOC_CONFIG_MALLOC_CONF "${JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE}")
-    endif()
-    message (STATUS "jemalloc malloc_conf: ${JEMALLOC_CONFIG_MALLOC_CONF}")
-
-    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc")
-
-    set (SRCS
-        ${LIBRARY_DIR}/src/arena.c
-        ${LIBRARY_DIR}/src/background_thread.c
-        ${LIBRARY_DIR}/src/base.c
-        ${LIBRARY_DIR}/src/bin.c
-        ${LIBRARY_DIR}/src/bitmap.c
-        ${LIBRARY_DIR}/src/ckh.c
-        ${LIBRARY_DIR}/src/ctl.c
-        ${LIBRARY_DIR}/src/div.c
-        ${LIBRARY_DIR}/src/extent.c
-        ${LIBRARY_DIR}/src/extent_dss.c
-        ${LIBRARY_DIR}/src/extent_mmap.c
-        ${LIBRARY_DIR}/src/hash.c
-        ${LIBRARY_DIR}/src/hook.c
-        ${LIBRARY_DIR}/src/jemalloc.c
-        ${LIBRARY_DIR}/src/large.c
-        ${LIBRARY_DIR}/src/log.c
-        ${LIBRARY_DIR}/src/malloc_io.c
-        ${LIBRARY_DIR}/src/mutex.c
-        ${LIBRARY_DIR}/src/mutex_pool.c
-        ${LIBRARY_DIR}/src/nstime.c
-        ${LIBRARY_DIR}/src/pages.c
-        ${LIBRARY_DIR}/src/prng.c
-        ${LIBRARY_DIR}/src/prof.c
-        ${LIBRARY_DIR}/src/rtree.c
-        ${LIBRARY_DIR}/src/sc.c
-        ${LIBRARY_DIR}/src/stats.c
-        ${LIBRARY_DIR}/src/sz.c
-        ${LIBRARY_DIR}/src/tcache.c
-        ${LIBRARY_DIR}/src/test_hooks.c
-        ${LIBRARY_DIR}/src/ticker.c
-        ${LIBRARY_DIR}/src/tsd.c
-        ${LIBRARY_DIR}/src/witness.c
-        ${LIBRARY_DIR}/src/safety_check.c
-    )
-    if (OS_DARWIN)
-        list(APPEND SRCS ${LIBRARY_DIR}/src/zone.c)
-    endif ()
-
-    add_library(jemalloc ${SRCS})
-    target_include_directories(jemalloc PRIVATE ${LIBRARY_DIR}/include)
-    target_include_directories(jemalloc SYSTEM PUBLIC include)
-
-    set (JEMALLOC_INCLUDE_PREFIX)
-    # OS_
-    if (OS_LINUX)
-        set (JEMALLOC_INCLUDE_PREFIX "include_linux")
-    elseif (OS_FREEBSD)
-        set (JEMALLOC_INCLUDE_PREFIX "include_freebsd")
-    elseif (OS_DARWIN)
-        set (JEMALLOC_INCLUDE_PREFIX "include_darwin")
-    else ()
-        message (FATAL_ERROR "internal jemalloc: This OS is not supported")
-    endif ()
-    # ARCH_
-    if (ARCH_AMD64)
-        set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_x86_64")
-    elseif (ARCH_ARM)
-        set(JEMALLOC_INCLUDE_PREFIX "${JEMALLOC_INCLUDE_PREFIX}_aarch64")
-    else ()
-        message (FATAL_ERROR "internal jemalloc: This arch is not supported")
-    endif ()
-
-    configure_file(${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h.in
-        ${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h)
-    target_include_directories(jemalloc SYSTEM PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal)
-
-    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
-
-    if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-        target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1 -DJEMALLOC_PROF=1)
-
-        if (USE_UNWIND)
-            target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
-            target_link_libraries (jemalloc PRIVATE unwind)
         endif ()
     endif ()
 
-    target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
+    set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_JEMALLOC=1)
-    # for RTLD_NEXT
+    if (MAKE_STATIC_LIBRARIES)
-    target_compile_options(jemalloc PRIVATE -D_GNU_SOURCE)
+        # To detect whether we need to register jemalloc for osx as default zone.
+        set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS BUNDLED_STATIC_JEMALLOC=1)
+    endif()
 
-    set (USE_INTERNAL_JEMALLOC_LIBRARY 1)
+    message (STATUS "Using jemalloc")
+else ()
+    add_library(jemalloc INTERFACE)
+    target_compile_definitions(jemalloc INTERFACE USE_JEMALLOC=0)
+
+    message (STATUS "Not using jemalloc")
 endif ()
-
-set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_JEMALLOC=1)
-if (MAKE_STATIC_LIBRARIES)
-    # To detect whether we need to register jemalloc for osx as default zone.
-    set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS BUNDLED_STATIC_JEMALLOC=1)
-endif()
-
-message (STATUS "Using jemalloc")

contrib/libcpuid-cmake/CMakeLists.txt

@@ -1,38 +1,35 @@
 option (ENABLE_CPUID "Enable libcpuid library (only internal)" ${ENABLE_LIBRARIES})
 
-if (ARCH_ARM AND ENABLE_CPUID)
+if (ARCH_ARM)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "cpuid is not supported on ARM")
     set (ENABLE_CPUID 0)
 endif ()
 
-if (NOT ENABLE_CPUID)
+if (ENABLE_CPUID)
+    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcpuid)
+
+    set (SRCS
+        ${LIBRARY_DIR}/libcpuid/asm-bits.c
+        ${LIBRARY_DIR}/libcpuid/cpuid_main.c
+        ${LIBRARY_DIR}/libcpuid/libcpuid_util.c
+        ${LIBRARY_DIR}/libcpuid/msrdriver.c
+        ${LIBRARY_DIR}/libcpuid/rdmsr.c
+        ${LIBRARY_DIR}/libcpuid/rdtsc.c
+        ${LIBRARY_DIR}/libcpuid/recog_amd.c
+        ${LIBRARY_DIR}/libcpuid/recog_intel.c
+    )
+
+    add_library (cpuid ${SRCS})
+
+    target_include_directories (cpuid SYSTEM PUBLIC ${LIBRARY_DIR})
+    target_compile_definitions (cpuid PUBLIC USE_CPUID=1)
+    target_compile_definitions (cpuid PRIVATE VERSION="v0.4.1")
+    if (COMPILER_CLANG)
+        target_compile_options (cpuid PRIVATE -Wno-reserved-id-macro)
+    endif ()
+
+    message (STATUS "Using cpuid")
+else ()
     add_library (cpuid INTERFACE)
 
     target_compile_definitions (cpuid INTERFACE USE_CPUID=0)
-
-    return()
-endif()
-
-set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcpuid")
-
-set (SRCS
-    ${LIBRARY_DIR}/libcpuid/asm-bits.c
-    ${LIBRARY_DIR}/libcpuid/cpuid_main.c
-    ${LIBRARY_DIR}/libcpuid/libcpuid_util.c
-    ${LIBRARY_DIR}/libcpuid/msrdriver.c
-    ${LIBRARY_DIR}/libcpuid/rdmsr.c
-    ${LIBRARY_DIR}/libcpuid/rdtsc.c
-    ${LIBRARY_DIR}/libcpuid/recog_amd.c
-    ${LIBRARY_DIR}/libcpuid/recog_intel.c
-)
-
-add_library (cpuid ${SRCS})
-
-target_include_directories (cpuid SYSTEM PUBLIC ${LIBRARY_DIR})
-target_compile_definitions (cpuid PUBLIC USE_CPUID=1)
-target_compile_definitions (cpuid PRIVATE VERSION="v0.4.1")
-if (COMPILER_CLANG)
-    target_compile_options (cpuid PRIVATE -Wno-reserved-id-macro)
 endif ()
-
-message (STATUS "Using cpuid")

contrib/libhdfs3-cmake/CMakeLists.txt

@@ -1,12 +1,4 @@
-option(PROTOBUF_OLD_ABI_COMPAT "Set to ON for compatiability with external protobuf which was compiled old C++ ABI" ON)
+if (NOT USE_INTERNAL_PROTOBUF_LIBRARY)
-
-if (PROTOBUF_OLD_ABI_COMPAT)
-    if (NOT ENABLE_PROTOBUF OR USE_INTERNAL_PROTOBUF_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "PROTOBUF_OLD_ABI_COMPAT option is ignored")
-    endif()
-endif()
-
-if (NOT USE_INTERNAL_PROTOBUF_LIBRARY AND PROTOBUF_OLD_ABI_COMPAT)
     # compatiable with protobuf which was compiled old C++ ABI
     set(CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
     set(CMAKE_C_FLAGS "")
@@ -15,7 +7,7 @@ if (NOT USE_INTERNAL_PROTOBUF_LIBRARY AND PROTOBUF_OLD_ABI_COMPAT)
     endif ()
 endif()
 
-set(WITH_KERBEROS false)
+SET(WITH_KERBEROS false)
 # project and source dir
 set(HDFS3_ROOT_DIR ${ClickHouse_SOURCE_DIR}/contrib/libhdfs3)
 set(HDFS3_SOURCE_DIR ${HDFS3_ROOT_DIR}/src)

contrib/lz4-cmake/CMakeLists.txt

@@ -1,30 +1,13 @@
 option (USE_INTERNAL_LZ4_LIBRARY "Use internal lz4 library" ${NOT_UNBUNDLED})
 
-if (NOT USE_INTERNAL_LZ4_LIBRARY)
+if (USE_INTERNAL_LZ4_LIBRARY)
-    find_library (LIBRARY_LZ4 lz4)
+    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/lz4)
-    find_path (INCLUDE_LZ4 lz4.h)
-
-    if (LIBRARY_LZ4 AND INCLUDE_LZ4)
-        set(EXTERNAL_LZ4_LIBRARY_FOUND 1)
-        add_library (lz4 UNKNOWN IMPORTED)
-        set_property (TARGET lz4 PROPERTY IMPORTED_LOCATION ${LIBRARY_LZ4})
-        set_property (TARGET lz4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_LZ4})
-        set_property (TARGET lz4 APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_XXHASH=0)
-    else()
-        set(EXTERNAL_LZ4_LIBRARY_FOUND 0)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system lz4")
-    endif()
-endif()
-
-if (NOT EXTERNAL_LZ4_LIBRARY_FOUND)
-    set (USE_INTERNAL_LZ4_LIBRARY 1)
-    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/lz4")
 
     set (SRCS
-        "${LIBRARY_DIR}/lib/lz4.c"
+        ${LIBRARY_DIR}/lib/lz4.c
-        "${LIBRARY_DIR}/lib/lz4hc.c"
+        ${LIBRARY_DIR}/lib/lz4hc.c
-        "${LIBRARY_DIR}/lib/lz4frame.c"
+        ${LIBRARY_DIR}/lib/lz4frame.c
-        "${LIBRARY_DIR}/lib/xxhash.c"
+        ${LIBRARY_DIR}/lib/xxhash.c
     )
 
     add_library (lz4 ${SRCS})
@@ -34,4 +17,12 @@ if (NOT EXTERNAL_LZ4_LIBRARY_FOUND)
         target_compile_options (lz4 PRIVATE -fno-sanitize=undefined)
     endif ()
     target_include_directories(lz4 PUBLIC ${LIBRARY_DIR}/lib)
+else ()
+    find_library (LIBRARY_LZ4 lz4)
+    find_path (INCLUDE_LZ4 lz4.h)
+
+    add_library (lz4 UNKNOWN IMPORTED)
+    set_property (TARGET lz4 PROPERTY IMPORTED_LOCATION ${LIBRARY_LZ4})
+    set_property (TARGET lz4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_LZ4})
+    set_property (TARGET lz4 APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_XXHASH=0)
 endif ()

contrib/poco-cmake/CMakeLists.txt

@@ -4,9 +4,6 @@ if (USE_INTERNAL_POCO_LIBRARY)
     set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/poco)
 else ()
     find_path (ROOT_DIR NAMES Foundation/include/Poco/Poco.h include/Poco/Poco.h)
-    if (NOT ROOT_DIR)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system poco")
-    endif()
 endif ()
 
 add_subdirectory (Crypto)

contrib/replxx-cmake/CMakeLists.txt

@@ -1,26 +1,35 @@
 option (ENABLE_REPLXX "Enable replxx support" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_REPLXX)
+if (ENABLE_REPLXX)
-    if (USE_INTERNAL_REPLXX_LIBRARY)
+    option (USE_INTERNAL_REPLXX "Use internal replxx library" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal replxx with ENABLE_REPLXX=OFF")
-    endif()
 
-    add_library(replxx INTERFACE)
+    if (USE_INTERNAL_REPLXX)
-    target_compile_definitions(replxx INTERFACE USE_REPLXX=0)
+        set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/replxx")
 
-    message (STATUS "Not using replxx (Beware! Runtime fallback to readline is possible!)")
+        set(SRCS
-    return()
+            ${LIBRARY_DIR}/src/conversion.cxx
-endif()
+            ${LIBRARY_DIR}/src/ConvertUTF.cpp
+            ${LIBRARY_DIR}/src/escape.cxx
+            ${LIBRARY_DIR}/src/history.cxx
+            ${LIBRARY_DIR}/src/io.cxx
+            ${LIBRARY_DIR}/src/prompt.cxx
+            ${LIBRARY_DIR}/src/replxx_impl.cxx
+            ${LIBRARY_DIR}/src/replxx.cxx
+            ${LIBRARY_DIR}/src/util.cxx
+            ${LIBRARY_DIR}/src/wcwidth.cpp
+        )
 
-option (USE_INTERNAL_REPLXX_LIBRARY "Use internal replxx library" ${NOT_UNBUNDLED})
+        add_library (replxx ${SRCS})
+        target_include_directories(replxx SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+    else ()
+        find_library(LIBRARY_REPLXX NAMES replxx replxx-static)
+        find_path(INCLUDE_REPLXX replxx.hxx)
 
-if (NOT USE_INTERNAL_REPLXX_LIBRARY)
+        add_library(replxx UNKNOWN IMPORTED)
-    find_library(LIBRARY_REPLXX NAMES replxx replxx-static)
+        set_property(TARGET replxx PROPERTY IMPORTED_LOCATION ${LIBRARY_REPLXX})
-    find_path(INCLUDE_REPLXX replxx.hxx)
+        target_include_directories(replxx SYSTEM PUBLIC ${INCLUDE_REPLXX})
 
-    if (LIBRARY_REPLXX AND INCLUDE_REPLXX)
+        set(CMAKE_REQUIRED_LIBRARIES replxx)
-        set(CMAKE_REQUIRED_LIBRARIES ${LIBRARY_REPLXX})
-        set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_REPLXX})
         check_cxx_source_compiles(
             "
             #include <replxx.hxx>
@@ -32,43 +41,20 @@ if (NOT USE_INTERNAL_REPLXX_LIBRARY)
         )
 
         if (NOT EXTERNAL_REPLXX_WORKS)
-            message (${RECONFIGURE_MESSAGE_LEVEL} "replxx is unusable: ${LIBRARY_REPLXX} ${INCLUDE_REPLXX}")
+            message (FATAL_ERROR "replxx is unusable: ${LIBRARY_REPLXX} ${INCLUDE_REPLXX}")
-        else()
+        endif ()
-            add_library(replxx UNKNOWN IMPORTED)
+    endif ()
-            set_property(TARGET replxx PROPERTY IMPORTED_LOCATION ${LIBRARY_REPLXX})
-            target_include_directories(replxx SYSTEM PUBLIC ${INCLUDE_REPLXX})
-        endif()
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system replxx")
-    endif()
-endif()
 
+    if (COMPILER_CLANG)
+        target_compile_options(replxx PRIVATE -Wno-documentation)
+    endif ()
 
-if (NOT LIBRARY_REPLXX OR NOT INCLUDE_REPLXX OR NOT EXTERNAL_REPLXX_WORKS)
+    target_compile_definitions(replxx PUBLIC USE_REPLXX=1)
-    set(USE_INTERNAL_REPLXX_LIBRARY 1)
-    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/replxx")
 
-    set(SRCS
+    message (STATUS "Using replxx")
-        ${LIBRARY_DIR}/src/conversion.cxx
+else ()
-        ${LIBRARY_DIR}/src/ConvertUTF.cpp
+    add_library(replxx INTERFACE)
-        ${LIBRARY_DIR}/src/escape.cxx
+    target_compile_definitions(replxx INTERFACE USE_REPLXX=0)
-        ${LIBRARY_DIR}/src/history.cxx
-        ${LIBRARY_DIR}/src/io.cxx
-        ${LIBRARY_DIR}/src/prompt.cxx
-        ${LIBRARY_DIR}/src/replxx_impl.cxx
-        ${LIBRARY_DIR}/src/replxx.cxx
-        ${LIBRARY_DIR}/src/util.cxx
-        ${LIBRARY_DIR}/src/wcwidth.cpp
-    )
 
-    add_library (replxx ${SRCS})
+    message (STATUS "Not using replxx (Beware! Runtime fallback to readline is possible!)")
-    target_include_directories(replxx SYSTEM PUBLIC ${LIBRARY_DIR}/include)
 endif ()
-
-if (COMPILER_CLANG)
-    target_compile_options(replxx PRIVATE -Wno-documentation)
-endif ()
-
-target_compile_definitions(replxx PUBLIC USE_REPLXX=1)
-
-message (STATUS "Using replxx")

contrib/unixodbc-cmake/CMakeLists.txt

@@ -1,336 +1,318 @@
 option (ENABLE_ODBC "Enable ODBC library" ${ENABLE_LIBRARIES})
 
 if (NOT OS_LINUX)
-    if (ENABLE_ODBC)
-        message(STATUS "ODBC is only supported on Linux")
-    endif()
     set (ENABLE_ODBC OFF CACHE INTERNAL "")
 endif ()
 
-if (NOT ENABLE_ODBC)
+if (ENABLE_ODBC)
-    if (USE_INTERNAL_ODBC_LIBRARY)
+    option (USE_INTERNAL_ODBC_LIBRARY "Use internal ODBC library" ${NOT_UNBUNDLED})
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal ODBC with ENABLE_ODBC=OFF")
-    endif()
 
+    if (USE_INTERNAL_ODBC_LIBRARY)
+        set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/unixodbc)
+
+        # ltdl
+
+        set (SRCS_LTDL
+            # This file is generated by 'libtool' inside libltdl directory and then removed.
+            linux_x86_64/libltdl/libltdlcS.c
+
+            ${LIBRARY_DIR}/libltdl/lt__alloc.c
+            ${LIBRARY_DIR}/libltdl/lt__strl.c
+            ${LIBRARY_DIR}/libltdl/ltdl.c
+            ${LIBRARY_DIR}/libltdl/lt_dlloader.c
+            ${LIBRARY_DIR}/libltdl/slist.c
+            ${LIBRARY_DIR}/libltdl/lt_error.c
+            ${LIBRARY_DIR}/libltdl/loaders/dlopen.c
+            ${LIBRARY_DIR}/libltdl/loaders/preopen.c
+        )
+
+        add_library (ltdl ${SRCS_LTDL})
+
+        target_include_directories(ltdl
+            PRIVATE
+                linux_x86_64/libltdl
+            PUBLIC
+                ${LIBRARY_DIR}/libltdl
+                ${LIBRARY_DIR}/libltdl/libltdl
+        )
+        target_compile_definitions(ltdl PRIVATE -DHAVE_CONFIG_H -DLTDL -DLTDLOPEN=libltdlc)
+        target_compile_options(ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-warning-option -O2)
+
+        # odbc
+
+        set (SRCS
+            ${LIBRARY_DIR}/DriverManager/__attribute.c
+            ${LIBRARY_DIR}/DriverManager/__connection.c
+            ${LIBRARY_DIR}/DriverManager/__handles.c
+            ${LIBRARY_DIR}/DriverManager/__info.c
+            ${LIBRARY_DIR}/DriverManager/__stats.c
+            ${LIBRARY_DIR}/DriverManager/SQLAllocConnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLAllocEnv.c
+            ${LIBRARY_DIR}/DriverManager/SQLAllocHandle.c
+            ${LIBRARY_DIR}/DriverManager/SQLAllocHandleStd.c
+            ${LIBRARY_DIR}/DriverManager/SQLAllocStmt.c
+            ${LIBRARY_DIR}/DriverManager/SQLBindCol.c
+            ${LIBRARY_DIR}/DriverManager/SQLBindParam.c
+            ${LIBRARY_DIR}/DriverManager/SQLBindParameter.c
+            ${LIBRARY_DIR}/DriverManager/SQLBrowseConnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLBrowseConnectW.c
+            ${LIBRARY_DIR}/DriverManager/SQLBulkOperations.c
+            ${LIBRARY_DIR}/DriverManager/SQLCancel.c
+            ${LIBRARY_DIR}/DriverManager/SQLCancelHandle.c
+            ${LIBRARY_DIR}/DriverManager/SQLCloseCursor.c
+            ${LIBRARY_DIR}/DriverManager/SQLColAttribute.c
+            ${LIBRARY_DIR}/DriverManager/SQLColAttributes.c
+            ${LIBRARY_DIR}/DriverManager/SQLColAttributesW.c
+            ${LIBRARY_DIR}/DriverManager/SQLColAttributeW.c
+            ${LIBRARY_DIR}/DriverManager/SQLColumnPrivileges.c
+            ${LIBRARY_DIR}/DriverManager/SQLColumnPrivilegesW.c
+            ${LIBRARY_DIR}/DriverManager/SQLColumns.c
+            ${LIBRARY_DIR}/DriverManager/SQLColumnsW.c
+            ${LIBRARY_DIR}/DriverManager/SQLConnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLConnectW.c
+            ${LIBRARY_DIR}/DriverManager/SQLCopyDesc.c
+            ${LIBRARY_DIR}/DriverManager/SQLDataSources.c
+            ${LIBRARY_DIR}/DriverManager/SQLDataSourcesW.c
+            ${LIBRARY_DIR}/DriverManager/SQLDescribeCol.c
+            ${LIBRARY_DIR}/DriverManager/SQLDescribeColW.c
+            ${LIBRARY_DIR}/DriverManager/SQLDescribeParam.c
+            ${LIBRARY_DIR}/DriverManager/SQLDisconnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLDriverConnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLDriverConnectW.c
+            ${LIBRARY_DIR}/DriverManager/SQLDrivers.c
+            ${LIBRARY_DIR}/DriverManager/SQLDriversW.c
+            ${LIBRARY_DIR}/DriverManager/SQLEndTran.c
+            ${LIBRARY_DIR}/DriverManager/SQLError.c
+            ${LIBRARY_DIR}/DriverManager/SQLErrorW.c
+            ${LIBRARY_DIR}/DriverManager/SQLExecDirect.c
+            ${LIBRARY_DIR}/DriverManager/SQLExecDirectW.c
+            ${LIBRARY_DIR}/DriverManager/SQLExecute.c
+            ${LIBRARY_DIR}/DriverManager/SQLExtendedFetch.c
+            ${LIBRARY_DIR}/DriverManager/SQLFetch.c
+            ${LIBRARY_DIR}/DriverManager/SQLFetchScroll.c
+            ${LIBRARY_DIR}/DriverManager/SQLForeignKeys.c
+            ${LIBRARY_DIR}/DriverManager/SQLForeignKeysW.c
+            ${LIBRARY_DIR}/DriverManager/SQLFreeConnect.c
+            ${LIBRARY_DIR}/DriverManager/SQLFreeEnv.c
+            ${LIBRARY_DIR}/DriverManager/SQLFreeHandle.c
+            ${LIBRARY_DIR}/DriverManager/SQLFreeStmt.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttrW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetConnectOption.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetConnectOptionW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetCursorName.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetCursorNameW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetData.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDescField.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDescFieldW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDescRec.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDescRecW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDiagField.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDiagFieldW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDiagRec.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetDiagRecW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetEnvAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetFunctions.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetInfo.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetInfoW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttrW.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetStmtOption.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfo.c
+            ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfoW.c
+            ${LIBRARY_DIR}/DriverManager/SQLMoreResults.c
+            ${LIBRARY_DIR}/DriverManager/SQLNativeSql.c
+            ${LIBRARY_DIR}/DriverManager/SQLNativeSqlW.c
+            ${LIBRARY_DIR}/DriverManager/SQLNumParams.c
+            ${LIBRARY_DIR}/DriverManager/SQLNumResultCols.c
+            ${LIBRARY_DIR}/DriverManager/SQLParamData.c
+            ${LIBRARY_DIR}/DriverManager/SQLParamOptions.c
+            ${LIBRARY_DIR}/DriverManager/SQLPrepare.c
+            ${LIBRARY_DIR}/DriverManager/SQLPrepareW.c
+            ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeys.c
+            ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeysW.c
+            ${LIBRARY_DIR}/DriverManager/SQLProcedureColumns.c
+            ${LIBRARY_DIR}/DriverManager/SQLProcedureColumnsW.c
+            ${LIBRARY_DIR}/DriverManager/SQLProcedures.c
+            ${LIBRARY_DIR}/DriverManager/SQLProceduresW.c
+            ${LIBRARY_DIR}/DriverManager/SQLPutData.c
+            ${LIBRARY_DIR}/DriverManager/SQLRowCount.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttrW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetConnectOption.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetConnectOptionW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetCursorName.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetCursorNameW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetDescField.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetDescFieldW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetDescRec.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetEnvAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetParam.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetPos.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetScrollOptions.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttr.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttrW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetStmtOption.c
+            ${LIBRARY_DIR}/DriverManager/SQLSetStmtOptionW.c
+            ${LIBRARY_DIR}/DriverManager/SQLSpecialColumns.c
+            ${LIBRARY_DIR}/DriverManager/SQLSpecialColumnsW.c
+            ${LIBRARY_DIR}/DriverManager/SQLStatistics.c
+            ${LIBRARY_DIR}/DriverManager/SQLStatisticsW.c
+            ${LIBRARY_DIR}/DriverManager/SQLTablePrivileges.c
+            ${LIBRARY_DIR}/DriverManager/SQLTablePrivilegesW.c
+            ${LIBRARY_DIR}/DriverManager/SQLTables.c
+            ${LIBRARY_DIR}/DriverManager/SQLTablesW.c
+            ${LIBRARY_DIR}/DriverManager/SQLTransact.c
+            ${LIBRARY_DIR}/ini/_iniDump.c
+            ${LIBRARY_DIR}/ini/_iniObjectRead.c
+            ${LIBRARY_DIR}/ini/_iniPropertyRead.c
+            ${LIBRARY_DIR}/ini/_iniScanUntilObject.c
+            ${LIBRARY_DIR}/ini/iniAllTrim.c
+            ${LIBRARY_DIR}/ini/iniAppend.c
+            ${LIBRARY_DIR}/ini/iniClose.c
+            ${LIBRARY_DIR}/ini/iniCommit.c
+            ${LIBRARY_DIR}/ini/iniCursor.c
+            ${LIBRARY_DIR}/ini/iniDelete.c
+            ${LIBRARY_DIR}/ini/iniElement.c
+            ${LIBRARY_DIR}/ini/iniElementCount.c
+            ${LIBRARY_DIR}/ini/iniGetBookmark.c
+            ${LIBRARY_DIR}/ini/iniGotoBookmark.c
+            ${LIBRARY_DIR}/ini/iniObject.c
+            ${LIBRARY_DIR}/ini/iniObjectDelete.c
+            ${LIBRARY_DIR}/ini/iniObjectEOL.c
+            ${LIBRARY_DIR}/ini/iniObjectFirst.c
+            ${LIBRARY_DIR}/ini/iniObjectInsert.c
+            ${LIBRARY_DIR}/ini/iniObjectLast.c
+            ${LIBRARY_DIR}/ini/iniObjectNext.c
+            ${LIBRARY_DIR}/ini/iniObjectSeek.c
+            ${LIBRARY_DIR}/ini/iniObjectSeekSure.c
+            ${LIBRARY_DIR}/ini/iniObjectUpdate.c
+            ${LIBRARY_DIR}/ini/iniOpen.c
+            ${LIBRARY_DIR}/ini/iniProperty.c
+            ${LIBRARY_DIR}/ini/iniPropertyDelete.c
+            ${LIBRARY_DIR}/ini/iniPropertyEOL.c
+            ${LIBRARY_DIR}/ini/iniPropertyFirst.c
+            ${LIBRARY_DIR}/ini/iniPropertyInsert.c
+            ${LIBRARY_DIR}/ini/iniPropertyLast.c
+            ${LIBRARY_DIR}/ini/iniPropertyNext.c
+            ${LIBRARY_DIR}/ini/iniPropertySeek.c
+            ${LIBRARY_DIR}/ini/iniPropertySeekSure.c
+            ${LIBRARY_DIR}/ini/iniPropertyUpdate.c
+            ${LIBRARY_DIR}/ini/iniPropertyValue.c
+            ${LIBRARY_DIR}/ini/iniToUpper.c
+            ${LIBRARY_DIR}/ini/iniValue.c
+            ${LIBRARY_DIR}/log/_logFreeMsg.c
+            ${LIBRARY_DIR}/log/logClear.c
+            ${LIBRARY_DIR}/log/logClose.c
+            ${LIBRARY_DIR}/log/logOn.c
+            ${LIBRARY_DIR}/log/logOpen.c
+            ${LIBRARY_DIR}/log/logPeekMsg.c
+            ${LIBRARY_DIR}/log/logPopMsg.c
+            ${LIBRARY_DIR}/log/logPushMsg.c
+            ${LIBRARY_DIR}/lst/_lstAdjustCurrent.c
+            ${LIBRARY_DIR}/lst/_lstDump.c
+            ${LIBRARY_DIR}/lst/_lstFreeItem.c
+            ${LIBRARY_DIR}/lst/_lstNextValidItem.c
+            ${LIBRARY_DIR}/lst/_lstPrevValidItem.c
+            ${LIBRARY_DIR}/lst/_lstVisible.c
+            ${LIBRARY_DIR}/lst/lstAppend.c
+            ${LIBRARY_DIR}/lst/lstClose.c
+            ${LIBRARY_DIR}/lst/lstDelete.c
+            ${LIBRARY_DIR}/lst/lstEOL.c
+            ${LIBRARY_DIR}/lst/lstFirst.c
+            ${LIBRARY_DIR}/lst/lstGet.c
+            ${LIBRARY_DIR}/lst/lstGetBookMark.c
+            ${LIBRARY_DIR}/lst/lstGoto.c
+            ${LIBRARY_DIR}/lst/lstGotoBookMark.c
+            ${LIBRARY_DIR}/lst/lstInsert.c
+            ${LIBRARY_DIR}/lst/lstLast.c
+            ${LIBRARY_DIR}/lst/lstNext.c
+            ${LIBRARY_DIR}/lst/lstOpen.c
+            ${LIBRARY_DIR}/lst/lstOpenCursor.c
+            ${LIBRARY_DIR}/lst/lstPrev.c
+            ${LIBRARY_DIR}/lst/lstSeek.c
+            ${LIBRARY_DIR}/lst/lstSeekItem.c
+            ${LIBRARY_DIR}/lst/lstSet.c
+            ${LIBRARY_DIR}/lst/lstSetFreeFunc.c
+            ${LIBRARY_DIR}/odbcinst/_logging.c
+            ${LIBRARY_DIR}/odbcinst/_odbcinst_ConfigModeINI.c
+            ${LIBRARY_DIR}/odbcinst/_odbcinst_GetEntries.c
+            ${LIBRARY_DIR}/odbcinst/_odbcinst_GetSections.c
+            ${LIBRARY_DIR}/odbcinst/_odbcinst_SystemINI.c
+            ${LIBRARY_DIR}/odbcinst/_odbcinst_UserINI.c
+            ${LIBRARY_DIR}/odbcinst/_SQLDriverConnectPrompt.c
+            ${LIBRARY_DIR}/odbcinst/_SQLGetInstalledDrivers.c
+            ${LIBRARY_DIR}/odbcinst/_SQLWriteInstalledDrivers.c
+            ${LIBRARY_DIR}/odbcinst/ODBCINSTConstructProperties.c
+            ${LIBRARY_DIR}/odbcinst/ODBCINSTDestructProperties.c
+            ${LIBRARY_DIR}/odbcinst/ODBCINSTSetProperty.c
+            ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperties.c
+            ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperty.c
+            ${LIBRARY_DIR}/odbcinst/SQLConfigDataSource.c
+            ${LIBRARY_DIR}/odbcinst/SQLConfigDriver.c
+            ${LIBRARY_DIR}/odbcinst/SQLCreateDataSource.c
+            ${LIBRARY_DIR}/odbcinst/SQLGetAvailableDrivers.c
+            ${LIBRARY_DIR}/odbcinst/SQLGetConfigMode.c
+            ${LIBRARY_DIR}/odbcinst/SQLGetInstalledDrivers.c
+            ${LIBRARY_DIR}/odbcinst/SQLGetPrivateProfileString.c
+            ${LIBRARY_DIR}/odbcinst/SQLGetTranslator.c
+            ${LIBRARY_DIR}/odbcinst/SQLInstallDriverEx.c
+            ${LIBRARY_DIR}/odbcinst/SQLInstallDriverManager.c
+            ${LIBRARY_DIR}/odbcinst/SQLInstallerError.c
+            ${LIBRARY_DIR}/odbcinst/SQLInstallODBC.c
+            ${LIBRARY_DIR}/odbcinst/SQLInstallTranslatorEx.c
+            ${LIBRARY_DIR}/odbcinst/SQLManageDataSources.c
+            ${LIBRARY_DIR}/odbcinst/SQLPostInstallerError.c
+            ${LIBRARY_DIR}/odbcinst/SQLReadFileDSN.c
+            ${LIBRARY_DIR}/odbcinst/SQLRemoveDriver.c
+            ${LIBRARY_DIR}/odbcinst/SQLRemoveDriverManager.c
+            ${LIBRARY_DIR}/odbcinst/SQLRemoveDSNFromIni.c
+            ${LIBRARY_DIR}/odbcinst/SQLRemoveTranslator.c
+            ${LIBRARY_DIR}/odbcinst/SQLSetConfigMode.c
+            ${LIBRARY_DIR}/odbcinst/SQLValidDSN.c
+            ${LIBRARY_DIR}/odbcinst/SQLWriteDSNToIni.c
+            ${LIBRARY_DIR}/odbcinst/SQLWriteFileDSN.c
+            ${LIBRARY_DIR}/odbcinst/SQLWritePrivateProfileString.c
+        )
+
+        add_library (unixodbc ${SRCS})
+
+        target_link_libraries (unixodbc PRIVATE ltdl)
+
+        # SYSTEM_FILE_PATH was changed to /etc
+
+        target_include_directories (unixodbc
+            PRIVATE
+                linux_x86_64/private
+            PUBLIC
+                linux_x86_64
+                ${LIBRARY_DIR}/include
+        )
+        target_compile_definitions (unixodbc PRIVATE -DHAVE_CONFIG_H)
+        target_compile_options (unixodbc
+            PRIVATE
+                -Wno-dangling-else
+                -Wno-parentheses
+                -Wno-misleading-indentation
+                -Wno-unknown-warning-option
+                -Wno-reserved-id-macro
+                -O2
+        )
+    else ()
+        add_library (unixodbc UNKNOWN IMPORTED)
+
+        find_library (LIBRARY_ODBC unixodbc)
+        find_path (INCLUDE_ODBC sql.h)
+        set_target_properties (unixodbc PROPERTIES IMPORTED_LOCATION ${LIBRARY_ODBC})
+        set_target_properties (unixodbc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_ODBC})
+    endif ()
+
+    target_compile_definitions (unixodbc INTERFACE USE_ODBC=1)
+
+    message (STATUS "Using unixodbc")
+else ()
     add_library (unixodbc INTERFACE)
     target_compile_definitions (unixodbc INTERFACE USE_ODBC=0)
 
     message (STATUS "Not using unixodbc")
-    return()
-endif()
-
-option (USE_INTERNAL_ODBC_LIBRARY "Use internal ODBC library" ${NOT_UNBUNDLED})
-
-if (NOT USE_INTERNAL_ODBC_LIBRARY)
-    find_library (LIBRARY_ODBC unixodbc)
-    find_path (INCLUDE_ODBC sql.h)
-
-    if(LIBRARY_ODBC AND INCLUDE_ODBC)
-        add_library (unixodbc UNKNOWN IMPORTED)
-        set_target_properties (unixodbc PROPERTIES IMPORTED_LOCATION ${LIBRARY_ODBC})
-        set_target_properties (unixodbc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INCLUDE_ODBC})
-        set(EXTERNAL_ODBC_LIBRARY_FOUND 1)
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system ODBC library")
-        set(EXTERNAL_ODBC_LIBRARY_FOUND 0)
-    endif()
-endif()
-
-if (NOT EXTERNAL_ODBC_LIBRARY_FOUND)
-    set (USE_INTERNAL_ODBC_LIBRARY 1)
-
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/unixodbc)
-
-    # ltdl
-
-    set (SRCS_LTDL
-        # This file is generated by 'libtool' inside libltdl directory and then removed.
-        linux_x86_64/libltdl/libltdlcS.c
-
-        ${LIBRARY_DIR}/libltdl/lt__alloc.c
-        ${LIBRARY_DIR}/libltdl/lt__strl.c
-        ${LIBRARY_DIR}/libltdl/ltdl.c
-        ${LIBRARY_DIR}/libltdl/lt_dlloader.c
-        ${LIBRARY_DIR}/libltdl/slist.c
-        ${LIBRARY_DIR}/libltdl/lt_error.c
-        ${LIBRARY_DIR}/libltdl/loaders/dlopen.c
-        ${LIBRARY_DIR}/libltdl/loaders/preopen.c
-    )
-
-    add_library (ltdl ${SRCS_LTDL})
-
-    target_include_directories(ltdl
-        PRIVATE
-            linux_x86_64/libltdl
-        PUBLIC
-            ${LIBRARY_DIR}/libltdl
-            ${LIBRARY_DIR}/libltdl/libltdl
-    )
-    target_compile_definitions(ltdl PRIVATE -DHAVE_CONFIG_H -DLTDL -DLTDLOPEN=libltdlc)
-    target_compile_options(ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-warning-option -O2)
-
-    # odbc
-
-    set (SRCS
-        ${LIBRARY_DIR}/DriverManager/__attribute.c
-        ${LIBRARY_DIR}/DriverManager/__connection.c
-        ${LIBRARY_DIR}/DriverManager/__handles.c
-        ${LIBRARY_DIR}/DriverManager/__info.c
-        ${LIBRARY_DIR}/DriverManager/__stats.c
-        ${LIBRARY_DIR}/DriverManager/SQLAllocConnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLAllocEnv.c
-        ${LIBRARY_DIR}/DriverManager/SQLAllocHandle.c
-        ${LIBRARY_DIR}/DriverManager/SQLAllocHandleStd.c
-        ${LIBRARY_DIR}/DriverManager/SQLAllocStmt.c
-        ${LIBRARY_DIR}/DriverManager/SQLBindCol.c
-        ${LIBRARY_DIR}/DriverManager/SQLBindParam.c
-        ${LIBRARY_DIR}/DriverManager/SQLBindParameter.c
-        ${LIBRARY_DIR}/DriverManager/SQLBrowseConnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLBrowseConnectW.c
-        ${LIBRARY_DIR}/DriverManager/SQLBulkOperations.c
-        ${LIBRARY_DIR}/DriverManager/SQLCancel.c
-        ${LIBRARY_DIR}/DriverManager/SQLCancelHandle.c
-        ${LIBRARY_DIR}/DriverManager/SQLCloseCursor.c
-        ${LIBRARY_DIR}/DriverManager/SQLColAttribute.c
-        ${LIBRARY_DIR}/DriverManager/SQLColAttributes.c
-        ${LIBRARY_DIR}/DriverManager/SQLColAttributesW.c
-        ${LIBRARY_DIR}/DriverManager/SQLColAttributeW.c
-        ${LIBRARY_DIR}/DriverManager/SQLColumnPrivileges.c
-        ${LIBRARY_DIR}/DriverManager/SQLColumnPrivilegesW.c
-        ${LIBRARY_DIR}/DriverManager/SQLColumns.c
-        ${LIBRARY_DIR}/DriverManager/SQLColumnsW.c
-        ${LIBRARY_DIR}/DriverManager/SQLConnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLConnectW.c
-        ${LIBRARY_DIR}/DriverManager/SQLCopyDesc.c
-        ${LIBRARY_DIR}/DriverManager/SQLDataSources.c
-        ${LIBRARY_DIR}/DriverManager/SQLDataSourcesW.c
-        ${LIBRARY_DIR}/DriverManager/SQLDescribeCol.c
-        ${LIBRARY_DIR}/DriverManager/SQLDescribeColW.c
-        ${LIBRARY_DIR}/DriverManager/SQLDescribeParam.c
-        ${LIBRARY_DIR}/DriverManager/SQLDisconnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLDriverConnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLDriverConnectW.c
-        ${LIBRARY_DIR}/DriverManager/SQLDrivers.c
-        ${LIBRARY_DIR}/DriverManager/SQLDriversW.c
-        ${LIBRARY_DIR}/DriverManager/SQLEndTran.c
-        ${LIBRARY_DIR}/DriverManager/SQLError.c
-        ${LIBRARY_DIR}/DriverManager/SQLErrorW.c
-        ${LIBRARY_DIR}/DriverManager/SQLExecDirect.c
-        ${LIBRARY_DIR}/DriverManager/SQLExecDirectW.c
-        ${LIBRARY_DIR}/DriverManager/SQLExecute.c
-        ${LIBRARY_DIR}/DriverManager/SQLExtendedFetch.c
-        ${LIBRARY_DIR}/DriverManager/SQLFetch.c
-        ${LIBRARY_DIR}/DriverManager/SQLFetchScroll.c
-        ${LIBRARY_DIR}/DriverManager/SQLForeignKeys.c
-        ${LIBRARY_DIR}/DriverManager/SQLForeignKeysW.c
-        ${LIBRARY_DIR}/DriverManager/SQLFreeConnect.c
-        ${LIBRARY_DIR}/DriverManager/SQLFreeEnv.c
-        ${LIBRARY_DIR}/DriverManager/SQLFreeHandle.c
-        ${LIBRARY_DIR}/DriverManager/SQLFreeStmt.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttrW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetConnectOption.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetConnectOptionW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetCursorName.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetCursorNameW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetData.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDescField.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDescFieldW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDescRec.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDescRecW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDiagField.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDiagFieldW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDiagRec.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetDiagRecW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetEnvAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetFunctions.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetInfo.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetInfoW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttrW.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetStmtOption.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfo.c
-        ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfoW.c
-        ${LIBRARY_DIR}/DriverManager/SQLMoreResults.c
-        ${LIBRARY_DIR}/DriverManager/SQLNativeSql.c
-        ${LIBRARY_DIR}/DriverManager/SQLNativeSqlW.c
-        ${LIBRARY_DIR}/DriverManager/SQLNumParams.c
-        ${LIBRARY_DIR}/DriverManager/SQLNumResultCols.c
-        ${LIBRARY_DIR}/DriverManager/SQLParamData.c
-        ${LIBRARY_DIR}/DriverManager/SQLParamOptions.c
-        ${LIBRARY_DIR}/DriverManager/SQLPrepare.c
-        ${LIBRARY_DIR}/DriverManager/SQLPrepareW.c
-        ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeys.c
-        ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeysW.c
-        ${LIBRARY_DIR}/DriverManager/SQLProcedureColumns.c
-        ${LIBRARY_DIR}/DriverManager/SQLProcedureColumnsW.c
-        ${LIBRARY_DIR}/DriverManager/SQLProcedures.c
-        ${LIBRARY_DIR}/DriverManager/SQLProceduresW.c
-        ${LIBRARY_DIR}/DriverManager/SQLPutData.c
-        ${LIBRARY_DIR}/DriverManager/SQLRowCount.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttrW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetConnectOption.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetConnectOptionW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetCursorName.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetCursorNameW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetDescField.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetDescFieldW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetDescRec.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetEnvAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetParam.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetPos.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetScrollOptions.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttr.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttrW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetStmtOption.c
-        ${LIBRARY_DIR}/DriverManager/SQLSetStmtOptionW.c
-        ${LIBRARY_DIR}/DriverManager/SQLSpecialColumns.c
-        ${LIBRARY_DIR}/DriverManager/SQLSpecialColumnsW.c
-        ${LIBRARY_DIR}/DriverManager/SQLStatistics.c
-        ${LIBRARY_DIR}/DriverManager/SQLStatisticsW.c
-        ${LIBRARY_DIR}/DriverManager/SQLTablePrivileges.c
-        ${LIBRARY_DIR}/DriverManager/SQLTablePrivilegesW.c
-        ${LIBRARY_DIR}/DriverManager/SQLTables.c
-        ${LIBRARY_DIR}/DriverManager/SQLTablesW.c
-        ${LIBRARY_DIR}/DriverManager/SQLTransact.c
-        ${LIBRARY_DIR}/ini/_iniDump.c
-        ${LIBRARY_DIR}/ini/_iniObjectRead.c
-        ${LIBRARY_DIR}/ini/_iniPropertyRead.c
-        ${LIBRARY_DIR}/ini/_iniScanUntilObject.c
-        ${LIBRARY_DIR}/ini/iniAllTrim.c
-        ${LIBRARY_DIR}/ini/iniAppend.c
-        ${LIBRARY_DIR}/ini/iniClose.c
-        ${LIBRARY_DIR}/ini/iniCommit.c
-        ${LIBRARY_DIR}/ini/iniCursor.c
-        ${LIBRARY_DIR}/ini/iniDelete.c
-        ${LIBRARY_DIR}/ini/iniElement.c
-        ${LIBRARY_DIR}/ini/iniElementCount.c
-        ${LIBRARY_DIR}/ini/iniGetBookmark.c
-        ${LIBRARY_DIR}/ini/iniGotoBookmark.c
-        ${LIBRARY_DIR}/ini/iniObject.c
-        ${LIBRARY_DIR}/ini/iniObjectDelete.c
-        ${LIBRARY_DIR}/ini/iniObjectEOL.c
-        ${LIBRARY_DIR}/ini/iniObjectFirst.c
-        ${LIBRARY_DIR}/ini/iniObjectInsert.c
-        ${LIBRARY_DIR}/ini/iniObjectLast.c
-        ${LIBRARY_DIR}/ini/iniObjectNext.c
-        ${LIBRARY_DIR}/ini/iniObjectSeek.c
-        ${LIBRARY_DIR}/ini/iniObjectSeekSure.c
-        ${LIBRARY_DIR}/ini/iniObjectUpdate.c
-        ${LIBRARY_DIR}/ini/iniOpen.c
-        ${LIBRARY_DIR}/ini/iniProperty.c
-        ${LIBRARY_DIR}/ini/iniPropertyDelete.c
-        ${LIBRARY_DIR}/ini/iniPropertyEOL.c
-        ${LIBRARY_DIR}/ini/iniPropertyFirst.c
-        ${LIBRARY_DIR}/ini/iniPropertyInsert.c
-        ${LIBRARY_DIR}/ini/iniPropertyLast.c
-        ${LIBRARY_DIR}/ini/iniPropertyNext.c
-        ${LIBRARY_DIR}/ini/iniPropertySeek.c
-        ${LIBRARY_DIR}/ini/iniPropertySeekSure.c
-        ${LIBRARY_DIR}/ini/iniPropertyUpdate.c
-        ${LIBRARY_DIR}/ini/iniPropertyValue.c
-        ${LIBRARY_DIR}/ini/iniToUpper.c
-        ${LIBRARY_DIR}/ini/iniValue.c
-        ${LIBRARY_DIR}/log/_logFreeMsg.c
-        ${LIBRARY_DIR}/log/logClear.c
-        ${LIBRARY_DIR}/log/logClose.c
-        ${LIBRARY_DIR}/log/logOn.c
-        ${LIBRARY_DIR}/log/logOpen.c
-        ${LIBRARY_DIR}/log/logPeekMsg.c
-        ${LIBRARY_DIR}/log/logPopMsg.c
-        ${LIBRARY_DIR}/log/logPushMsg.c
-        ${LIBRARY_DIR}/lst/_lstAdjustCurrent.c
-        ${LIBRARY_DIR}/lst/_lstDump.c
-        ${LIBRARY_DIR}/lst/_lstFreeItem.c
-        ${LIBRARY_DIR}/lst/_lstNextValidItem.c
-        ${LIBRARY_DIR}/lst/_lstPrevValidItem.c
-        ${LIBRARY_DIR}/lst/_lstVisible.c
-        ${LIBRARY_DIR}/lst/lstAppend.c
-        ${LIBRARY_DIR}/lst/lstClose.c
-        ${LIBRARY_DIR}/lst/lstDelete.c
-        ${LIBRARY_DIR}/lst/lstEOL.c
-        ${LIBRARY_DIR}/lst/lstFirst.c
-        ${LIBRARY_DIR}/lst/lstGet.c
-        ${LIBRARY_DIR}/lst/lstGetBookMark.c
-        ${LIBRARY_DIR}/lst/lstGoto.c
-        ${LIBRARY_DIR}/lst/lstGotoBookMark.c
-        ${LIBRARY_DIR}/lst/lstInsert.c
-        ${LIBRARY_DIR}/lst/lstLast.c
-        ${LIBRARY_DIR}/lst/lstNext.c
-        ${LIBRARY_DIR}/lst/lstOpen.c
-        ${LIBRARY_DIR}/lst/lstOpenCursor.c
-        ${LIBRARY_DIR}/lst/lstPrev.c
-        ${LIBRARY_DIR}/lst/lstSeek.c
-        ${LIBRARY_DIR}/lst/lstSeekItem.c
-        ${LIBRARY_DIR}/lst/lstSet.c
-        ${LIBRARY_DIR}/lst/lstSetFreeFunc.c
-        ${LIBRARY_DIR}/odbcinst/_logging.c
-        ${LIBRARY_DIR}/odbcinst/_odbcinst_ConfigModeINI.c
-        ${LIBRARY_DIR}/odbcinst/_odbcinst_GetEntries.c
-        ${LIBRARY_DIR}/odbcinst/_odbcinst_GetSections.c
-        ${LIBRARY_DIR}/odbcinst/_odbcinst_SystemINI.c
-        ${LIBRARY_DIR}/odbcinst/_odbcinst_UserINI.c
-        ${LIBRARY_DIR}/odbcinst/_SQLDriverConnectPrompt.c
-        ${LIBRARY_DIR}/odbcinst/_SQLGetInstalledDrivers.c
-        ${LIBRARY_DIR}/odbcinst/_SQLWriteInstalledDrivers.c
-        ${LIBRARY_DIR}/odbcinst/ODBCINSTConstructProperties.c
-        ${LIBRARY_DIR}/odbcinst/ODBCINSTDestructProperties.c
-        ${LIBRARY_DIR}/odbcinst/ODBCINSTSetProperty.c
-        ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperties.c
-        ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperty.c
-        ${LIBRARY_DIR}/odbcinst/SQLConfigDataSource.c
-        ${LIBRARY_DIR}/odbcinst/SQLConfigDriver.c
-        ${LIBRARY_DIR}/odbcinst/SQLCreateDataSource.c
-        ${LIBRARY_DIR}/odbcinst/SQLGetAvailableDrivers.c
-        ${LIBRARY_DIR}/odbcinst/SQLGetConfigMode.c
-        ${LIBRARY_DIR}/odbcinst/SQLGetInstalledDrivers.c
-        ${LIBRARY_DIR}/odbcinst/SQLGetPrivateProfileString.c
-        ${LIBRARY_DIR}/odbcinst/SQLGetTranslator.c
-        ${LIBRARY_DIR}/odbcinst/SQLInstallDriverEx.c
-        ${LIBRARY_DIR}/odbcinst/SQLInstallDriverManager.c
-        ${LIBRARY_DIR}/odbcinst/SQLInstallerError.c
-        ${LIBRARY_DIR}/odbcinst/SQLInstallODBC.c
-        ${LIBRARY_DIR}/odbcinst/SQLInstallTranslatorEx.c
-        ${LIBRARY_DIR}/odbcinst/SQLManageDataSources.c
-        ${LIBRARY_DIR}/odbcinst/SQLPostInstallerError.c
-        ${LIBRARY_DIR}/odbcinst/SQLReadFileDSN.c
-        ${LIBRARY_DIR}/odbcinst/SQLRemoveDriver.c
-        ${LIBRARY_DIR}/odbcinst/SQLRemoveDriverManager.c
-        ${LIBRARY_DIR}/odbcinst/SQLRemoveDSNFromIni.c
-        ${LIBRARY_DIR}/odbcinst/SQLRemoveTranslator.c
-        ${LIBRARY_DIR}/odbcinst/SQLSetConfigMode.c
-        ${LIBRARY_DIR}/odbcinst/SQLValidDSN.c
-        ${LIBRARY_DIR}/odbcinst/SQLWriteDSNToIni.c
-        ${LIBRARY_DIR}/odbcinst/SQLWriteFileDSN.c
-        ${LIBRARY_DIR}/odbcinst/SQLWritePrivateProfileString.c
-    )
-
-    add_library (unixodbc ${SRCS})
-
-    target_link_libraries (unixodbc PRIVATE ltdl)
-
-    # SYSTEM_FILE_PATH was changed to /etc
-
-    target_include_directories (unixodbc
-        PRIVATE
-            linux_x86_64/private
-        PUBLIC
-            linux_x86_64
-            ${LIBRARY_DIR}/include
-    )
-    target_compile_definitions (unixodbc PRIVATE -DHAVE_CONFIG_H)
-    target_compile_options (unixodbc
-        PRIVATE
-            -Wno-dangling-else
-            -Wno-parentheses
-            -Wno-misleading-indentation
-            -Wno-unknown-warning-option
-            -Wno-reserved-id-macro
-            -O2
-    )
 endif ()
-
-target_compile_definitions (unixodbc INTERFACE USE_ODBC=1)
-
-message (STATUS "Using unixodbc")