Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into ldap-user-dn-detection

.github/ISSUE_TEMPLATE/40_bug-report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-(you don't have to strictly follow this form)
+You have to provide the following information whenever possible.
 
 **Describe the bug**
 A clear and concise description of what works not as it is supposed to.

.gitignore

@@ -27,6 +27,7 @@
 /docs/zh/single.md
 /docs/ja/single.md
 /docs/fa/single.md
+/docs/en/development/cmake-in-clickhouse.md
 
 # callgrind files
 callgrind.out.*

.gitmodules

@@ -17,6 +17,7 @@
 [submodule "contrib/zlib-ng"]
 	path = contrib/zlib-ng
 	url = https://github.com/ClickHouse-Extras/zlib-ng.git
+	branch = clickhouse-new
 [submodule "contrib/googletest"]
 	path = contrib/googletest
 	url = https://github.com/google/googletest.git

CMakeLists.txt

@@ -167,9 +167,10 @@ endif ()
 
 # If turned `ON`, assumes the user has either the system GTest library or the bundled one.
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
+option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
 
-if (OS_LINUX AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
-    # Only for Linux, x86_64.
+if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
+    # Only for Linux, x86_64 or aarch64.
     option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)
 elseif(GLIBC_COMPATIBILITY)
     message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
@@ -257,12 +258,17 @@ endif()
 
 include(cmake/cpu_features.cmake)
 
-option(ARCH_NATIVE "Add -march=native compiler flag")
+option(ARCH_NATIVE "Add -march=native compiler flag. This makes your binaries non-portable but more performant code may be generated.")
 
 if (ARCH_NATIVE)
     set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=native")
 endif ()
 
+# Asynchronous unwind tables are needed for Query Profiler.
+# They are already by default on some platforms but possibly not on all platforms.
+# Enable it explicitly.
+set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
+
 if (${CMAKE_VERSION} VERSION_LESS "3.12.4")
     # CMake < 3.12 doesn't support setting 20 as a C++ standard version.
     # We will add C++ standard controlling flag in CMAKE_CXX_FLAGS manually for now.
@@ -494,6 +500,7 @@ include (cmake/find/krb5.cmake)
 include (cmake/find/libgsasl.cmake)
 include (cmake/find/cyrus-sasl.cmake)
 include (cmake/find/rdkafka.cmake)
+include (cmake/find/libuv.cmake) # for amqpcpp and cassandra
 include (cmake/find/amqpcpp.cmake)
 include (cmake/find/capnp.cmake)
 include (cmake/find/llvm.cmake)
@@ -516,9 +523,9 @@ include (cmake/find/fast_float.cmake)
 include (cmake/find/rapidjson.cmake)
 include (cmake/find/fastops.cmake)
 include (cmake/find/odbc.cmake)
+include (cmake/find/nanodbc.cmake)
 include (cmake/find/rocksdb.cmake)
 include (cmake/find/libpqxx.cmake)
-include (cmake/find/nanodbc.cmake)
 include (cmake/find/nuraft.cmake)
 
 
@@ -586,6 +593,9 @@ include_directories(${ConfigIncludePath})
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
 
+# Check if needed compiler flags are supported
+include (cmake/check_flags.cmake)
+
 add_subdirectory (base)
 add_subdirectory (src)
 add_subdirectory (programs)

README.md

@@ -8,7 +8,7 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Tutorial](https://clickhouse.tech/docs/en/getting_started/tutorial/) shows how to set up and query small ClickHouse cluster.
 * [Documentation](https://clickhouse.tech/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
-* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-nwwakmk4-xOJ6cdy0sJC3It8j348~IA) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
+* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-qfort0u8-TWqK4wIP0YSdoDE0btKa1w) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
 * [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
 * [Code Browser](https://clickhouse.tech/codebrowser/html_report/ClickHouse/index.html) with syntax highlight and navigation.
 * [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.

base/bridge/IBridge.cpp

@@ -159,17 +159,12 @@ void IBridge::initialize(Application & self)
     if (port > 0xFFFF)
         throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
 
-    http_timeout = config().getUInt("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+    http_timeout = config().getUInt64("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
     max_server_connections = config().getUInt("max-server-connections", 1024);
-    keep_alive_timeout = config().getUInt("keep-alive-timeout", 10);
+    keep_alive_timeout = config().getUInt64("keep-alive-timeout", 10);
 
     initializeTerminationAndSignalProcessing();
 
-#if USE_ODBC
-    if (bridgeName() == "ODBCBridge")
-        Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
     ServerApplication::initialize(self); // NOLINT
 }
 

base/common/CMakeLists.txt

@@ -29,7 +29,7 @@ elseif (ENABLE_READLINE)
 endif ()
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-include ${ClickHouse_SOURCE_DIR}/base/common/iostream_debug_helpers.h")
+    set (INCLUDE_DEBUG_HELPERS "-include \"${ClickHouse_SOURCE_DIR}/base/common/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
@@ -45,7 +45,7 @@ if (USE_INTERNAL_CCTZ)
     set_source_files_properties(DateLUTImpl.cpp PROPERTIES COMPILE_DEFINITIONS USE_INTERNAL_CCTZ)
 endif()
 
-target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
+target_include_directories(common PUBLIC .. "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
     target_link_libraries(common PUBLIC -Wl,-U,_inside_main)

base/common/DateLUTImpl.h

@@ -25,7 +25,7 @@
 
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
@@ -1266,7 +1266,7 @@ public:
 };
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 #endif

base/common/DecomposedFloat.h

@@ -0,0 +1,216 @@
+#pragma once
+
+#include <cstdint>
+#include <cstddef>
+#include <cstring>
+#include <common/extended_types.h>
+
+
+/// Allows to check the internals of IEEE-754 floating point number.
+
+template <typename T> struct FloatTraits;
+
+template <>
+struct FloatTraits<float>
+{
+    using UInt = uint32_t;
+    static constexpr size_t bits = 32;
+    static constexpr size_t exponent_bits = 8;
+    static constexpr size_t mantissa_bits = bits - exponent_bits - 1;
+};
+
+template <>
+struct FloatTraits<double>
+{
+    using UInt = uint64_t;
+    static constexpr size_t bits = 64;
+    static constexpr size_t exponent_bits = 11;
+    static constexpr size_t mantissa_bits = bits - exponent_bits - 1;
+};
+
+
+/// x = sign * (2 ^ normalized_exponent) * (1 + mantissa * 2 ^ -mantissa_bits)
+/// x = sign * (2 ^ normalized_exponent + mantissa * 2 ^ (normalized_exponent - mantissa_bits))
+template <typename T>
+struct DecomposedFloat
+{
+    using Traits = FloatTraits<T>;
+
+    DecomposedFloat(T x)
+    {
+        memcpy(&x_uint, &x, sizeof(x));
+    }
+
+    typename Traits::UInt x_uint;
+
+    bool is_negative() const
+    {
+        return x_uint >> (Traits::bits - 1);
+    }
+
+    /// Returns 0 for both +0. and -0.
+    int sign() const
+    {
+        return (exponent() == 0 && mantissa() == 0)
+            ? 0
+            : (is_negative()
+                ? -1
+                : 1);
+    }
+
+    uint16_t exponent() const
+    {
+        return (x_uint >> (Traits::mantissa_bits)) & (((1ull << (Traits::exponent_bits + 1)) - 1) >> 1);
+    }
+
+    int16_t normalized_exponent() const
+    {
+        return int16_t(exponent()) - ((1ull << (Traits::exponent_bits - 1)) - 1);
+    }
+
+    uint64_t mantissa() const
+    {
+        return x_uint & ((1ull << Traits::mantissa_bits) - 1);
+    }
+
+    int64_t mantissa_with_sign() const
+    {
+        return is_negative() ? -mantissa() : mantissa();
+    }
+
+    /// NOTE Probably floating point instructions can be better.
+    bool is_integer_in_representable_range() const
+    {
+        return x_uint == 0
+            || (normalized_exponent() >= 0  /// The number is not less than one
+                /// The number is inside the range where every integer has exact representation in float
+                && normalized_exponent() <= static_cast<int16_t>(Traits::mantissa_bits)
+                /// After multiplying by 2^exp, the fractional part becomes zero, means the number is integer
+                && ((mantissa() & ((1ULL << (Traits::mantissa_bits - normalized_exponent())) - 1)) == 0));
+    }
+
+
+    /// Compare float with integer of arbitrary width (both signed and unsigned are supported). Assuming two's complement arithmetic.
+    /// Infinities are compared correctly. NaNs are treat similarly to infinities, so they can be less than all numbers.
+    /// (note that we need total order)
+    template <typename Int>
+    int compare(Int rhs)
+    {
+        if (rhs == 0)
+            return sign();
+
+        /// Different signs
+        if (is_negative() && rhs > 0)
+            return -1;
+        if (!is_negative() && rhs < 0)
+            return 1;
+
+        /// Fractional number with magnitude less than one
+        if (normalized_exponent() < 0)
+        {
+            if (!is_negative())
+                return rhs > 0 ? -1 : 1;
+            else
+                return rhs >= 0 ? -1 : 1;
+        }
+
+        /// The case of the most negative integer
+        if constexpr (is_signed_v<Int>)
+        {
+            if (rhs == std::numeric_limits<Int>::lowest())
+            {
+                assert(is_negative());
+
+                if (normalized_exponent() < static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+                    return 1;
+                if (normalized_exponent() > static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+                    return -1;
+
+                if (mantissa() == 0)
+                    return 0;
+                else
+                    return -1;
+            }
+        }
+
+        /// Too large number: abs(float) > abs(rhs). Also the case with infinities and NaN.
+        if (normalized_exponent() >= static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+            return is_negative() ? -1 : 1;
+
+        using UInt = make_unsigned_t<Int>;
+        UInt uint_rhs = rhs < 0 ? -rhs : rhs;
+
+        /// Smaller octave: abs(rhs) < abs(float)
+        if (uint_rhs < (static_cast<UInt>(1) << normalized_exponent()))
+            return is_negative() ? -1 : 1;
+
+        /// Larger octave: abs(rhs) > abs(float)
+        if (normalized_exponent() + 1 < static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>)
+            && uint_rhs >= (static_cast<UInt>(1) << (normalized_exponent() + 1)))
+            return is_negative() ? 1 : -1;
+
+        /// The same octave
+        /// uint_rhs == 2 ^ normalized_exponent + mantissa * 2 ^ (normalized_exponent - mantissa_bits)
+
+        bool large_and_always_integer = normalized_exponent() >= static_cast<int16_t>(Traits::mantissa_bits);
+
+        typename Traits::UInt a = large_and_always_integer
+            ? mantissa() << (normalized_exponent() - Traits::mantissa_bits)
+            : mantissa() >> (Traits::mantissa_bits - normalized_exponent());
+
+        typename Traits::UInt b = uint_rhs - (static_cast<UInt>(1) << normalized_exponent());
+
+        if (a < b)
+            return is_negative() ? 1 : -1;
+        if (a > b)
+            return is_negative() ? -1 : 1;
+
+        /// Float has no fractional part means that the numbers are equal.
+        if (large_and_always_integer || (mantissa() & ((1ULL << (Traits::mantissa_bits - normalized_exponent())) - 1)) == 0)
+            return 0;
+        else
+            /// Float has fractional part means its abs value is larger.
+            return is_negative() ? -1 : 1;
+    }
+
+
+    template <typename Int>
+    bool equals(Int rhs)
+    {
+        return compare(rhs) == 0;
+    }
+
+    template <typename Int>
+    bool notEquals(Int rhs)
+    {
+        return compare(rhs) != 0;
+    }
+
+    template <typename Int>
+    bool less(Int rhs)
+    {
+        return compare(rhs) < 0;
+    }
+
+    template <typename Int>
+    bool greater(Int rhs)
+    {
+        return compare(rhs) > 0;
+    }
+
+    template <typename Int>
+    bool lessOrEquals(Int rhs)
+    {
+        return compare(rhs) <= 0;
+    }
+
+    template <typename Int>
+    bool greaterOrEquals(Int rhs)
+    {
+        return compare(rhs) >= 0;
+    }
+};
+
+
+using DecomposedFloat64 = DecomposedFloat<double>;
+using DecomposedFloat32 = DecomposedFloat<float>;

base/common/ReplxxLineReader.cpp

@@ -91,6 +91,10 @@ ReplxxLineReader::ReplxxLineReader(
     /// it also binded to M-p/M-n).
     rx.bind_key(Replxx::KEY::meta('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_NEXT, code); });
     rx.bind_key(Replxx::KEY::meta('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_PREVIOUS, code); });
+    /// By default M-BACKSPACE is KILL_TO_WHITESPACE_ON_LEFT, while in readline it is backward-kill-word
+    rx.bind_key(Replxx::KEY::meta(Replxx::KEY::BACKSPACE), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_BEGINING_OF_WORD, code); });
+    /// By default C-w is KILL_TO_BEGINING_OF_WORD, while in readline it is unix-word-rubout
+    rx.bind_key(Replxx::KEY::control('W'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_WHITESPACE_ON_LEFT, code); });
 
     rx.bind_key(Replxx::KEY::meta('E'), [this](char32_t) { openEditor(); return Replxx::ACTION_RESULT::CONTINUE; });
 }

base/common/arithmeticOverflow.h

@@ -56,27 +56,33 @@ namespace common
     }
 
     template <>
-    inline bool addOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool addOverflow(Int128 x, Int128 y, Int128 & res)
     {
-        static constexpr __int128 min_int128 = minInt128();
-        static constexpr __int128 max_int128 = maxInt128();
         res = addIgnoreOverflow(x, y);
-        return (y > 0 && x > max_int128 - y) || (y < 0 && x < min_int128 - y);
+        return (y > 0 && x > std::numeric_limits<Int128>::max() - y) ||
+            (y < 0 && x < std::numeric_limits<Int128>::min() - y);
     }
 
     template <>
-    inline bool addOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool addOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = addIgnoreOverflow(x, y);
-        return (y > 0 && x > std::numeric_limits<wInt256>::max() - y) ||
-            (y < 0 && x < std::numeric_limits<wInt256>::min() - y);
+        return x > std::numeric_limits<UInt128>::max() - y;
     }
 
     template <>
-    inline bool addOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool addOverflow(Int256 x, Int256 y, Int256 & res)
     {
         res = addIgnoreOverflow(x, y);
-        return x > std::numeric_limits<wUInt256>::max() - y;
+        return (y > 0 && x > std::numeric_limits<Int256>::max() - y) ||
+            (y < 0 && x < std::numeric_limits<Int256>::min() - y);
+    }
+
+    template <>
+    inline bool addOverflow(UInt256 x, UInt256 y, UInt256 & res)
+    {
+        res = addIgnoreOverflow(x, y);
+        return x > std::numeric_limits<UInt256>::max() - y;
     }
 
     template <typename T>
@@ -104,24 +110,30 @@ namespace common
     }
 
     template <>
-    inline bool subOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool subOverflow(Int128 x, Int128 y, Int128 & res)
     {
-        static constexpr __int128 min_int128 = minInt128();
-        static constexpr __int128 max_int128 = maxInt128();
         res = subIgnoreOverflow(x, y);
-        return (y < 0 && x > max_int128 + y) || (y > 0 && x < min_int128 + y);
+        return (y < 0 && x > std::numeric_limits<Int128>::max() + y) ||
+            (y > 0 && x < std::numeric_limits<Int128>::min() + y);
     }
 
     template <>
-    inline bool subOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool subOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = subIgnoreOverflow(x, y);
-        return (y < 0 && x > std::numeric_limits<wInt256>::max() + y) ||
-            (y > 0 && x < std::numeric_limits<wInt256>::min() + y);
+        return x < y;
     }
 
     template <>
-    inline bool subOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool subOverflow(Int256 x, Int256 y, Int256 & res)
+    {
+        res = subIgnoreOverflow(x, y);
+        return (y < 0 && x > std::numeric_limits<Int256>::max() + y) ||
+            (y > 0 && x < std::numeric_limits<Int256>::min() + y);
+    }
+
+    template <>
+    inline bool subOverflow(UInt256 x, UInt256 y, UInt256 & res)
     {
         res = subIgnoreOverflow(x, y);
         return x < y;
@@ -151,36 +163,33 @@ namespace common
         return __builtin_smulll_overflow(x, y, &res);
     }
 
+    /// Overflow check is not implemented for big integers.
+
     template <>
-    inline bool mulOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool mulOverflow(Int128 x, Int128 y, Int128 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-
-        unsigned __int128 a = (x > 0) ? x : -x;
-        unsigned __int128 b = (y > 0) ? y : -y;
-        return mulIgnoreOverflow(a, b) / b != a;
+        return false;
     }
 
     template <>
-    inline bool mulOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool mulOverflow(Int256 x, Int256 y, Int256 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-
-        wInt256 a = (x > 0) ? x : -x;
-        wInt256 b = (y > 0) ? y : -y;
-        return mulIgnoreOverflow(a, b) / b != a;
+        return false;
     }
 
     template <>
-    inline bool mulOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool mulOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-        return res / y != x;
+        return false;
+    }
+
+    template <>
+    inline bool mulOverflow(UInt256 x, UInt256 y, UInt256 & res)
+    {
+        res = mulIgnoreOverflow(x, y);
+        return false;
     }
 }

base/common/extended_types.h

@@ -5,16 +5,14 @@
 #include <common/types.h>
 #include <common/wide_integer.h>
 
-using Int128 = __int128;
 
-using wInt256 = wide::integer<256, signed>;
-using wUInt256 = wide::integer<256, unsigned>;
+using Int128 = wide::integer<128, signed>;
+using UInt128 = wide::integer<128, unsigned>;
+using Int256 = wide::integer<256, signed>;
+using UInt256 = wide::integer<256, unsigned>;
 
-static_assert(sizeof(wInt256) == 32);
-static_assert(sizeof(wUInt256) == 32);
-
-static constexpr __int128 minInt128() { return static_cast<unsigned __int128>(1) << 127; }
-static constexpr __int128 maxInt128() { return (static_cast<unsigned __int128>(1) << 127) - 1; }
+static_assert(sizeof(Int256) == 32);
+static_assert(sizeof(UInt256) == 32);
 
 /// The standard library type traits, such as std::is_arithmetic, with one exception
 /// (std::common_type), are "set in stone". Attempting to specialize them causes undefined behavior.
@@ -26,7 +24,7 @@ struct is_signed
 };
 
 template <> struct is_signed<Int128> { static constexpr bool value = true; };
-template <> struct is_signed<wInt256> { static constexpr bool value = true; };
+template <> struct is_signed<Int256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_signed_v = is_signed<T>::value;
@@ -37,7 +35,8 @@ struct is_unsigned
     static constexpr bool value = std::is_unsigned_v<T>;
 };
 
-template <> struct is_unsigned<wUInt256> { static constexpr bool value = true; };
+template <> struct is_unsigned<UInt128> { static constexpr bool value = true; };
+template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
@@ -51,8 +50,9 @@ struct is_integer
 };
 
 template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<wInt256> { static constexpr bool value = true; };
-template <> struct is_integer<wUInt256> { static constexpr bool value = true; };
+template <> struct is_integer<UInt128> { static constexpr bool value = true; };
+template <> struct is_integer<Int256> { static constexpr bool value = true; };
+template <> struct is_integer<UInt256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_integer_v = is_integer<T>::value;
@@ -64,7 +64,11 @@ struct is_arithmetic
     static constexpr bool value = std::is_arithmetic_v<T>;
 };
 
-template <> struct is_arithmetic<__int128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<Int128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<UInt128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<Int256> { static constexpr bool value = true; };
+template <> struct is_arithmetic<UInt256> { static constexpr bool value = true; };
+
 
 template <typename T>
 inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
@@ -75,9 +79,10 @@ struct make_unsigned
     typedef std::make_unsigned_t<T> type;
 };
 
-template <> struct make_unsigned<Int128> { using type = unsigned __int128; };
-template <> struct make_unsigned<wInt256>  { using type = wUInt256; };
-template <> struct make_unsigned<wUInt256> { using type = wUInt256; };
+template <> struct make_unsigned<Int128> { using type = UInt128; };
+template <> struct make_unsigned<UInt128> { using type = UInt128; };
+template <> struct make_unsigned<Int256>  { using type = UInt256; };
+template <> struct make_unsigned<UInt256> { using type = UInt256; };
 
 template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
 
@@ -87,8 +92,10 @@ struct make_signed
     typedef std::make_signed_t<T> type;
 };
 
-template <> struct make_signed<wInt256>  { using type = wInt256; };
-template <> struct make_signed<wUInt256> { using type = wInt256; };
+template <> struct make_signed<Int128>  { using type = Int128; };
+template <> struct make_signed<UInt128> { using type = Int128; };
+template <> struct make_signed<Int256>  { using type = Int256; };
+template <> struct make_signed<UInt256> { using type = Int256; };
 
 template <typename T> using make_signed_t = typename make_signed<T>::type;
 
@@ -98,8 +105,10 @@ struct is_big_int
     static constexpr bool value = false;
 };
 
-template <> struct is_big_int<wInt256> { static constexpr bool value = true; };
-template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
+template <> struct is_big_int<Int128> { static constexpr bool value = true; };
+template <> struct is_big_int<UInt128> { static constexpr bool value = true; };
+template <> struct is_big_int<Int256> { static constexpr bool value = true; };
+template <> struct is_big_int<UInt256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_big_int_v = is_big_int<T>::value;

base/common/getThreadId.cpp

@@ -25,6 +25,10 @@ uint64_t getThreadId()
         current_tid = syscall(SYS_gettid); /// This call is always successful. - man gettid
 #elif defined(OS_FREEBSD)
         current_tid = pthread_getthreadid_np();
+#elif defined(OS_SUNOS)
+        // On Solaris-derived systems, this returns the ID of the LWP, analogous
+        // to a thread.
+        current_tid = static_cast<uint64_t>(pthread_self());
 #else
         if (0 != pthread_threadid_np(nullptr, &current_tid))
             throw std::logic_error("pthread_threadid_np returned error");

base/common/itoa.h

@@ -30,9 +30,8 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
+#include <common/extended_types.h>
 
-using int128_t = __int128;
-using uint128_t = unsigned __int128;
 
 namespace impl
 {
@@ -106,7 +105,7 @@ using UnsignedOfSize = typename SelectType
     uint16_t,
     uint32_t,
     uint64_t,
-    uint128_t
+    __uint128_t
 >::Result;
 
 /// Holds the result of dividing an unsigned N-byte variable by 10^N resulting in
@@ -313,7 +312,8 @@ namespace convert
     }
 }
 
-static inline int digits10(uint128_t x)
+template <typename T>
+static inline int digits10(T x)
 {
     if (x < 10ULL)
         return 1;
@@ -346,8 +346,11 @@ static inline int digits10(uint128_t x)
     return 12 + digits10(x / 1000000000000ULL);
 }
 
-static inline char * writeUIntText(uint128_t x, char * p)
+template <typename T>
+static inline char * writeUIntText(T x, char * p)
 {
+    static_assert(is_unsigned_v<T>);
+
     int len = digits10(x);
     auto pp = p + len;
     while (x >= 100)
@@ -370,14 +373,28 @@ static inline char * writeLeadingMinus(char * pos)
     return pos + 1;
 }
 
-static inline char * writeSIntText(int128_t x, char * pos)
+template <typename T>
+static inline char * writeSIntText(T x, char * pos)
 {
-    static constexpr int128_t min_int128 = uint128_t(1) << 127;
+    static_assert(std::is_same_v<T, Int128> || std::is_same_v<T, Int256>);
 
-    if (unlikely(x == min_int128))
+    using UnsignedT = make_unsigned_t<T>;
+    static constexpr T min_int = UnsignedT(1) << (sizeof(T) * 8 - 1);
+
+    if (unlikely(x == min_int))
     {
-        memcpy(pos, "-170141183460469231731687303715884105728", 40);
-        return pos + 40;
+        if constexpr (std::is_same_v<T, Int128>)
+        {
+            const char * res = "-170141183460469231731687303715884105728";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
+        else if constexpr (std::is_same_v<T, Int256>)
+        {
+            const char * res = "-57896044618658097711785492504343953926634992332820282019728792003956564819968";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
     }
 
     if (x < 0)
@@ -385,7 +402,7 @@ static inline char * writeSIntText(int128_t x, char * pos)
         x = -x;
         pos = writeLeadingMinus(pos);
     }
-    return writeUIntText(static_cast<uint128_t>(x), pos);
+    return writeUIntText(UnsignedT(x), pos);
 }
 
 }
@@ -403,13 +420,25 @@ inline char * itoa(char8_t i, char * p)
 }
 
 template <>
-inline char * itoa<uint128_t>(uint128_t i, char * p)
+inline char * itoa(UInt128 i, char * p)
 {
     return impl::writeUIntText(i, p);
 }
 
 template <>
-inline char * itoa<int128_t>(int128_t i, char * p)
+inline char * itoa(Int128 i, char * p)
+{
+    return impl::writeSIntText(i, p);
+}
+
+template <>
+inline char * itoa(UInt256 i, char * p)
+{
+    return impl::writeUIntText(i, p);
+}
+
+template <>
+inline char * itoa(Int256 i, char * p)
 {
     return impl::writeSIntText(i, p);
 }

base/common/strong_typedef.h

@@ -4,7 +4,8 @@
 #include <type_traits>
 #include <utility>
 
-template <class T, class Tag>
+
+template <typename T, typename Tag>
 struct StrongTypedef
 {
 private:
@@ -38,14 +39,16 @@ public:
 
     bool operator==(const Self & rhs) const { return t == rhs.t; }
     bool operator<(const Self & rhs) const { return t < rhs.t; }
+    bool operator>(const Self & rhs) const { return t > rhs.t; }
 
     T & toUnderType() { return t; }
     const T & toUnderType() const { return t; }
 };
 
+
 namespace std
 {
-    template <class T, class Tag>
+    template <typename T, typename Tag>
     struct hash<StrongTypedef<T, Tag>>
     {
         size_t operator()(const StrongTypedef<T, Tag> & x) const

base/common/throwError.h

@@ -1,13 +1,15 @@
 #pragma once
+
 #include <stdexcept>
 
+
 /// Throw DB::Exception-like exception before its definition.
 /// DB::Exception derived from Poco::Exception derived from std::exception.
-/// DB::Exception generally cought as Poco::Exception. std::exception generally has other catch blocks and could lead to other outcomes.
+/// DB::Exception generally caught as Poco::Exception. std::exception generally has other catch blocks and could lead to other outcomes.
 /// DB::Exception is not defined yet. It'd better to throw Poco::Exception but we do not want to include any big header here, even <string>.
 /// So we throw some std::exception instead in the hope its catch block is the same as DB::Exception one.
 template <typename T>
-inline void throwError(const T & err)
+[[noreturn]] inline void throwError(const T & err)
 {
     throw std::runtime_error(err);
 }

base/common/time.h

@@ -2,7 +2,7 @@
 
 #include <time.h>
 
-#if defined (OS_DARWIN)
+#if defined (OS_DARWIN) || defined (OS_SUNOS)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
 #elif defined (OS_FREEBSD)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST

base/common/types.h

@@ -13,7 +13,12 @@ using char8_t = unsigned char;
 #endif
 
 /// This is needed for more strict aliasing. https://godbolt.org/z/xpJBSb https://stackoverflow.com/a/57453713
+#if !defined(PVS_STUDIO) /// But PVS-Studio does not treat it correctly.
 using UInt8 = char8_t;
+#else
+using UInt8 = uint8_t;
+#endif
+
 using UInt16 = uint16_t;
 using UInt32 = uint32_t;
 using UInt64 = uint64_t;

base/common/wide_integer.h

@@ -58,9 +58,11 @@ public:
     using signed_base_type = int64_t;
 
     // ctors
-    constexpr integer() noexcept;
+    constexpr integer() noexcept = default;
+
     template <typename T>
     constexpr integer(T rhs) noexcept;
+
     template <typename T>
     constexpr integer(std::initializer_list<T> il) noexcept;
 
@@ -108,9 +110,9 @@ public:
     constexpr explicit operator bool() const noexcept;
 
     template <class T>
-    using __integral_not_wide_integer_class = typename std::enable_if<std::is_arithmetic<T>::value, T>::type;
+    using _integral_not_wide_integer_class = typename std::enable_if<std::is_arithmetic<T>::value, T>::type;
 
-    template <class T, class = __integral_not_wide_integer_class<T>>
+    template <class T, class = _integral_not_wide_integer_class<T>>
     constexpr operator T() const noexcept;
 
     constexpr operator long double() const noexcept;
@@ -119,25 +121,27 @@ public:
 
     struct _impl;
 
+    base_type items[_impl::item_count];
+
 private:
     template <size_t Bits2, typename Signed2>
     friend class integer;
 
     friend class std::numeric_limits<integer<Bits, signed>>;
     friend class std::numeric_limits<integer<Bits, unsigned>>;
-
-    base_type items[_impl::item_count];
 };
 
 template <typename T>
 static constexpr bool ArithmeticConcept() noexcept;
+
 template <class T1, class T2>
-using __only_arithmetic = typename std::enable_if<ArithmeticConcept<T1>() && ArithmeticConcept<T2>()>::type;
+using _only_arithmetic = typename std::enable_if<ArithmeticConcept<T1>() && ArithmeticConcept<T2>()>::type;
 
 template <typename T>
 static constexpr bool IntegralConcept() noexcept;
+
 template <class T, class T2>
-using __only_integer = typename std::enable_if<IntegralConcept<T>() && IntegralConcept<T2>()>::type;
+using _only_integer = typename std::enable_if<IntegralConcept<T>() && IntegralConcept<T2>()>::type;
 
 // Unary operators
 template <size_t Bits, typename Signed>
@@ -153,54 +157,55 @@ constexpr integer<Bits, Signed> operator+(const integer<Bits, Signed> & lhs) noe
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator*(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator*(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator/(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator/(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator+(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator+(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator-(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator-(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator%(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator%(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator&(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator&(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator|(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator|(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator^(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator^(const Integral & rhs, const Integral2 & lhs);
 
 // TODO: Integral
 template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, int n) noexcept;
+
 template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, int n) noexcept;
 
@@ -217,32 +222,32 @@ constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, In
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator<(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator<(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator>(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator<=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator<=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator>=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator==(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator==(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator!=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator!=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 }

base/common/wide_integer_impl.h

@@ -5,6 +5,7 @@
 /// (See at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "throwError.h"
+
 #include <cmath>
 #include <cfloat>
 #include <cassert>
@@ -81,7 +82,7 @@ public:
             res.items[T::_impl::big(0)] = std::numeric_limits<typename wide::integer<Bits, Signed>::signed_base_type>::min();
             return res;
         }
-        return 0;
+        return wide::integer<Bits, Signed>(0);
     }
 
     static constexpr wide::integer<Bits, Signed> max() noexcept
@@ -176,7 +177,7 @@ struct integer<Bits, Signed>::_impl
     constexpr static bool is_negative(const integer<B, T> & n) noexcept
     {
         if constexpr (std::is_same_v<T, signed>)
-            return static_cast<signed_base_type>(n.items[big(0)]) < 0;
+            return static_cast<signed_base_type>(n.items[integer<B, T>::_impl::big(0)]) < 0;
         else
             return false;
     }
@@ -193,40 +194,36 @@ struct integer<Bits, Signed>::_impl
     template <size_t B, class S>
     constexpr static integer<B, S> make_positive(const integer<B, S> & n) noexcept
     {
-        return is_negative(n) ? operator_unary_minus(n) : n;
+        return is_negative(n) ? integer<B, S>(operator_unary_minus(n)) : n;
     }
 
     template <typename T>
     __attribute__((no_sanitize("undefined"))) constexpr static auto to_Integral(T f) noexcept
     {
-        if constexpr (std::is_same_v<T, __int128>)
-            return f;
-        else if constexpr (std::is_signed_v<T>)
+        if constexpr (std::is_signed_v<T>)
             return static_cast<int64_t>(f);
         else
             return static_cast<uint64_t>(f);
     }
 
     template <typename Integral>
-    constexpr static void wide_integer_from_bultin(integer<Bits, Signed> & self, Integral rhs) noexcept
+    constexpr static void wide_integer_from_builtin(integer<Bits, Signed> & self, Integral rhs) noexcept
     {
-        self.items[0] = _impl::to_Integral(rhs);
-        if constexpr (std::is_same_v<Integral, __int128>)
-            self.items[1] = rhs >> base_bits;
+        static_assert(sizeof(Integral) <= sizeof(base_type));
 
-        constexpr const unsigned start = (sizeof(Integral) == 16) ? 2 : 1;
+        self.items[0] = _impl::to_Integral(rhs);
 
         if constexpr (std::is_signed_v<Integral>)
         {
             if (rhs < 0)
             {
-                for (unsigned i = start; i < item_count; ++i)
+                for (size_t i = 1; i < item_count; ++i)
                     self.items[i] = -1;
                 return;
             }
         }
 
-        for (unsigned i = start; i < item_count; ++i)
+        for (size_t i = 1; i < item_count; ++i)
             self.items[i] = 0;
     }
 
@@ -239,7 +236,8 @@ struct integer<Bits, Signed>::_impl
      * a_(n - 1) = a_n * max_int + b2, a_n <= max_int <- base case.
      */
     template <class T>
-    constexpr static void set_multiplier(integer<Bits, Signed> & self, T t) noexcept {
+    constexpr static void set_multiplier(integer<Bits, Signed> & self, T t) noexcept
+    {
         constexpr uint64_t max_int = std::numeric_limits<uint64_t>::max();
 
         /// Implementation specific behaviour on overflow (if we don't check here, stack overflow will triggered in bigint_cast).
@@ -260,7 +258,8 @@ struct integer<Bits, Signed>::_impl
         self += static_cast<uint64_t>(t - alpha * static_cast<T>(max_int)); // += b_i
     }
 
-    constexpr static void wide_integer_from_bultin(integer<Bits, Signed>& self, double rhs) noexcept {
+    constexpr static void wide_integer_from_builtin(integer<Bits, Signed>& self, double rhs) noexcept
+    {
         constexpr int64_t max_int = std::numeric_limits<int64_t>::max();
         constexpr int64_t min_int = std::numeric_limits<int64_t>::min();
 
@@ -383,13 +382,13 @@ struct integer<Bits, Signed>::_impl
             if (bit_shift)
                 lhs.items[big(items_shift)] |= std::numeric_limits<base_type>::max() << (base_bits - bit_shift);
 
-            for (unsigned i = item_count - items_shift; i < items_shift; ++i)
-                lhs.items[little(i)] = std::numeric_limits<base_type>::max();
+            for (unsigned i = 0; i < items_shift; ++i)
+                lhs.items[big(i)] = std::numeric_limits<base_type>::max();
         }
         else
         {
-            for (unsigned i = item_count - items_shift; i < items_shift; ++i)
-                lhs.items[little(i)] = 0;
+            for (unsigned i = 0; i < items_shift; ++i)
+                lhs.items[big(i)] = 0;
         }
 
         return lhs;
@@ -397,23 +396,23 @@ struct integer<Bits, Signed>::_impl
 
 private:
     template <typename T>
-    constexpr static base_type get_item(const T & x, unsigned number)
+    constexpr static base_type get_item(const T & x, unsigned idx)
     {
         if constexpr (IsWideInteger<T>::value)
         {
-            if (number < T::_impl::item_count)
-                return x.items[number];
+            if (idx < T::_impl::item_count)
+                return x.items[idx];
             return 0;
         }
         else
         {
             if constexpr (sizeof(T) <= sizeof(base_type))
             {
-                if (!number)
+                if (0 == idx)
                     return x;
             }
-            else if (number * sizeof(base_type) < sizeof(T))
-                return x >> (number * base_bits); // & std::numeric_limits<base_type>::max()
+            else if (idx * sizeof(base_type) < sizeof(T))
+                return x >> (idx * base_bits); // & std::numeric_limits<base_type>::max()
             return 0;
         }
     }
@@ -439,7 +438,7 @@ private:
 
         for (unsigned i = 1; i < item_count; ++i)
         {
-            if (underflows[i-1])
+            if (underflows[i - 1])
             {
                 base_type & res_item = res.items[little(i)];
                 if (res_item == 0)
@@ -472,7 +471,7 @@ private:
 
         for (unsigned i = 1; i < item_count; ++i)
         {
-            if (overflows[i-1])
+            if (overflows[i - 1])
             {
                 base_type & res_item = res.items[little(i)];
                 ++res_item;
@@ -532,6 +531,17 @@ private:
             res.items[little(2)] = r12 >> 64;
             return res;
         }
+        else if constexpr (Bits == 128 && sizeof(base_type) == 8)
+        {
+            using CompilerUInt128 = unsigned __int128;
+            CompilerUInt128 a = (CompilerUInt128(lhs.items[1]) << 64) + lhs.items[0];
+            CompilerUInt128 b = (CompilerUInt128(rhs.items[1]) << 64) + rhs.items[0];
+            CompilerUInt128 c = a * b;
+            integer<Bits, Signed> res;
+            res.items[0] = c;
+            res.items[1] = c >> 64;
+            return res;
+        }
         else
         {
             integer<Bits, Signed> res{};
@@ -657,7 +667,7 @@ public:
     }
 
     template <typename T>
-    constexpr static bool operator_more(const integer<Bits, Signed> & lhs, const T & rhs) noexcept
+    constexpr static bool operator_greater(const integer<Bits, Signed> & lhs, const T & rhs) noexcept
     {
         if constexpr (should_keep_size<T>())
         {
@@ -677,7 +687,7 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, T>::_impl::operator_more(T(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, T>::_impl::operator_greater(T(lhs), rhs);
         }
     }
 
@@ -764,7 +774,6 @@ public:
         }
     }
 
-private:
     template <typename T>
     constexpr static bool is_zero(const T & x)
     {
@@ -781,46 +790,65 @@ private:
     }
 
     /// returns quotient as result and remainder in numerator.
-    template <typename T>
-    constexpr static T divide(T & numerator, T && denominator)
+    template <size_t Bits2>
+    constexpr static integer<Bits2, unsigned> divide(integer<Bits2, unsigned> & numerator, integer<Bits2, unsigned> denominator)
     {
-        if (is_zero(denominator))
-            throwError("divide by zero");
+        static_assert(std::is_unsigned_v<Signed>);
 
-        T & n = numerator;
-        T & d = denominator;
-        T x = 1;
-        T quotient = 0;
-
-        while (!operator_more(d, n) && operator_eq(operator_amp(shift_right(d, base_bits * item_count - 1), 1), 0))
+        if constexpr (Bits == 128 && sizeof(base_type) == 8)
         {
-            x = shift_left(x, 1);
-            d = shift_left(d, 1);
+            using CompilerUInt128 = unsigned __int128;
+
+            CompilerUInt128 a = (CompilerUInt128(numerator.items[1]) << 64) + numerator.items[0];
+            CompilerUInt128 b = (CompilerUInt128(denominator.items[1]) << 64) + denominator.items[0];
+            CompilerUInt128 c = a / b;
+
+            integer<Bits, Signed> res;
+            res.items[0] = c;
+            res.items[1] = c >> 64;
+
+            CompilerUInt128 remainder = a - b * c;
+            numerator.items[0] = remainder;
+            numerator.items[1] = remainder >> 64;
+
+            return res;
         }
 
-        while (!operator_eq(x, 0))
+        if (is_zero(denominator))
+            throwError("Division by zero");
+
+        integer<Bits2, unsigned> x = 1;
+        integer<Bits2, unsigned> quotient = 0;
+
+        while (!operator_greater(denominator, numerator) && is_zero(operator_amp(shift_right(denominator, Bits2 - 1), 1)))
         {
-            if (!operator_more(d, n))
+            x = shift_left(x, 1);
+            denominator = shift_left(denominator, 1);
+        }
+
+        while (!is_zero(x))
+        {
+            if (!operator_greater(denominator, numerator))
             {
-                n = operator_minus(n, d);
+                numerator = operator_minus(numerator, denominator);
                 quotient = operator_pipe(quotient, x);
             }
 
             x = shift_right(x, 1);
-            d = shift_right(d, 1);
+            denominator = shift_right(denominator, 1);
         }
 
         return quotient;
     }
 
-public:
     template <typename T>
     constexpr static auto operator_slash(const integer<Bits, Signed> & lhs, const T & rhs)
     {
         if constexpr (should_keep_size<T>())
         {
-            integer<Bits, Signed> numerator = make_positive(lhs);
-            integer<Bits, Signed> quotient = divide(numerator, make_positive(integer<Bits, Signed>(rhs)));
+            integer<Bits, unsigned> numerator = make_positive(lhs);
+            integer<Bits, unsigned> denominator = make_positive(integer<Bits, Signed>(rhs));
+            integer<Bits, unsigned> quotient = integer<Bits, unsigned>::_impl::divide(numerator, std::move(denominator));
 
             if (std::is_same_v<Signed, signed> && is_negative(rhs) != is_negative(lhs))
                 quotient = operator_unary_minus(quotient);
@@ -838,8 +866,9 @@ public:
     {
         if constexpr (should_keep_size<T>())
         {
-            integer<Bits, Signed> remainder = make_positive(lhs);
-            divide(remainder, make_positive(integer<Bits, Signed>(rhs)));
+            integer<Bits, unsigned> remainder = make_positive(lhs);
+            integer<Bits, unsigned> denominator = make_positive(integer<Bits, Signed>(rhs));
+            integer<Bits, unsigned>::_impl::divide(remainder, std::move(denominator));
 
             if (std::is_same_v<Signed, signed> && is_negative(lhs))
                 remainder = operator_unary_minus(remainder);
@@ -905,7 +934,7 @@ public:
                     ++c;
                 }
                 else
-                    throwError("invalid char from");
+                    throwError("Invalid char from");
             }
         }
         else
@@ -913,7 +942,7 @@ public:
             while (*c)
             {
                 if (*c < '0' || *c > '9')
-                    throwError("invalid char from");
+                    throwError("Invalid char from");
 
                 res = multiply(res, 10U);
                 res = plus(res, *c - '0');
@@ -930,11 +959,6 @@ public:
 
 // Members
 
-template <size_t Bits, typename Signed>
-constexpr integer<Bits, Signed>::integer() noexcept
-    : items{}
-{}
-
 template <size_t Bits, typename Signed>
 template <typename T>
 constexpr integer<Bits, Signed>::integer(T rhs) noexcept
@@ -943,7 +967,7 @@ constexpr integer<Bits, Signed>::integer(T rhs) noexcept
     if constexpr (IsWideInteger<T>::value)
         _impl::wide_integer_from_wide_integer(*this, rhs);
     else
-        _impl::wide_integer_from_bultin(*this, rhs);
+        _impl::wide_integer_from_builtin(*this, rhs);
 }
 
 template <size_t Bits, typename Signed>
@@ -956,10 +980,19 @@ constexpr integer<Bits, Signed>::integer(std::initializer_list<T> il) noexcept
         if constexpr (IsWideInteger<T>::value)
             _impl::wide_integer_from_wide_integer(*this, *il.begin());
         else
-            _impl::wide_integer_from_bultin(*this, *il.begin());
+            _impl::wide_integer_from_builtin(*this, *il.begin());
+    }
+    else if (il.size() == 0)
+    {
+        _impl::wide_integer_from_builtin(*this, 0);
     }
     else
-        _impl::wide_integer_from_bultin(*this, 0);
+    {
+        auto it = il.begin();
+        for (size_t i = 0; i < _impl::item_count; ++i)
+            if (it < il.end())
+                items[i] = *it;
+    }
 }
 
 template <size_t Bits, typename Signed>
@@ -974,7 +1007,7 @@ template <size_t Bits, typename Signed>
 template <typename T>
 constexpr integer<Bits, Signed> & integer<Bits, Signed>::operator=(T rhs) noexcept
 {
-    _impl::wide_integer_from_bultin(*this, rhs);
+    _impl::wide_integer_from_builtin(*this, rhs);
     return *this;
 }
 
@@ -1057,7 +1090,7 @@ constexpr integer<Bits, Signed> & integer<Bits, Signed>::operator>>=(int n) noex
 {
     if (static_cast<size_t>(n) >= Bits)
     {
-        if (is_negative(*this))
+        if (_impl::is_negative(*this))
             *this = -1;
         else
             *this = 0;
@@ -1107,16 +1140,17 @@ template <size_t Bits, typename Signed>
 template <class T, class>
 constexpr integer<Bits, Signed>::operator T() const noexcept
 {
-    if constexpr (std::is_same_v<T, __int128>)
-    {
-        static_assert(Bits >= 128);
-        return (__int128(items[1]) << 64) | items[0];
-    }
-    else
-    {
-        static_assert(std::numeric_limits<T>::is_integer);
-        return items[0];
-    }
+    static_assert(std::numeric_limits<T>::is_integer);
+
+    /// NOTE: memcpy will suffice, but unfortunately, this function is constexpr.
+
+    using UnsignedT = std::make_unsigned_t<T>;
+
+    UnsignedT res{};
+    for (unsigned i = 0; i < _impl::item_count && i < (sizeof(T) + sizeof(base_type) - 1) / sizeof(base_type); ++i)
+        res += UnsignedT(items[i]) << (sizeof(base_type) * 8 * i);
+
+    return res;
 }
 
 template <size_t Bits, typename Signed>
@@ -1280,7 +1314,7 @@ template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, int n) noexcept
 {
     if (static_cast<size_t>(n) >= Bits)
-        return 0;
+        return integer<Bits, Signed>(0);
     if (n <= 0)
         return lhs;
     return integer<Bits, Signed>::_impl::shift_left(lhs, n);
@@ -1289,7 +1323,7 @@ template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, int n) noexcept
 {
     if (static_cast<size_t>(n) >= Bits)
-        return 0;
+        return integer<Bits, Signed>(0);
     if (n <= 0)
         return lhs;
     return integer<Bits, Signed>::_impl::shift_right(lhs, n);
@@ -1309,7 +1343,7 @@ constexpr bool operator<(const Arithmetic & lhs, const Arithmetic2 & rhs)
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs)
 {
-    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_more(lhs, rhs);
+    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_greater(lhs, rhs);
 }
 template <typename Arithmetic, typename Arithmetic2, class>
 constexpr bool operator>(const Arithmetic & lhs, const Arithmetic2 & rhs)
@@ -1332,7 +1366,7 @@ constexpr bool operator<=(const Arithmetic & lhs, const Arithmetic2 & rhs)
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs)
 {
-    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_more(lhs, rhs)
+    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_greater(lhs, rhs)
         || std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_eq(lhs, rhs);
 }
 template <typename Arithmetic, typename Arithmetic2, class>

base/common/wide_integer_to_string.h

@@ -1,9 +1,12 @@
 #pragma once
 
 #include <string>
+#include <ostream>
+#include <fmt/format.h>
 
 #include "wide_integer.h"
 
+
 namespace wide
 {
 
@@ -33,3 +36,34 @@ inline std::string to_string(const integer<Bits, Signed> & n)
 }
 
 }
+
+
+template <size_t Bits, typename Signed>
+std::ostream & operator<<(std::ostream & out, const wide::integer<Bits, Signed> & value)
+{
+    return out << to_string(value);
+}
+
+
+/// See https://fmt.dev/latest/api.html#formatting-user-defined-types
+template <size_t Bits, typename Signed>
+struct fmt::formatter<wide::integer<Bits, Signed>>
+{
+    constexpr auto parse(format_parse_context & ctx)
+    {
+        auto it = ctx.begin();
+        auto end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw format_error("invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const wide::integer<Bits, Signed> & value, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{}", to_string(value));
+    }
+};

base/common/ya.make.in

@@ -35,7 +35,7 @@ PEERDIR(
 CFLAGS(-g0)
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
 )
 
 END()

base/daemon/SentryWriter.cpp

@@ -102,7 +102,7 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
     auto * logger = &Poco::Logger::get("SentryWriter");
     if (config.getBool("send_crash_reports.enabled", false))
     {
-        if (debug || (strlen(VERSION_OFFICIAL) > 0))
+        if (debug || (strlen(VERSION_OFFICIAL) > 0)) //-V560
         {
             enabled = true;
         }

base/glibc-compatibility/CMakeLists.txt

@@ -15,7 +15,7 @@ if (GLIBC_COMPATIBILITY)
 
     add_headers_and_sources(glibc_compatibility .)
     add_headers_and_sources(glibc_compatibility musl)
-    if (ARCH_ARM)
+    if (ARCH_AARCH64)
         list (APPEND glibc_compatibility_sources musl/aarch64/syscall.s musl/aarch64/longjmp.s)
         set (musl_arch_include_dir musl/aarch64)
     elseif (ARCH_AMD64)

base/glibc-compatibility/musl/lgamma.c

@@ -78,6 +78,9 @@
  *
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 static const double
 pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
 a0  =  7.72156649015328655494e-02, /* 0x3FB3C467, 0xE37DB0C8 */

base/glibc-compatibility/musl/lgammal.c

@@ -85,6 +85,9 @@
  *
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <stdint.h>
 #include <math.h>
 #include "libm.h"

base/glibc-compatibility/musl/libm.h

@@ -155,7 +155,7 @@ static inline long double fp_barrierl(long double x)
 static inline void fp_force_evalf(float x)
 {
 	volatile float y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 
@@ -164,7 +164,7 @@ static inline void fp_force_evalf(float x)
 static inline void fp_force_eval(double x)
 {
 	volatile double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 
@@ -173,7 +173,7 @@ static inline void fp_force_eval(double x)
 static inline void fp_force_evall(long double x)
 {
 	volatile long double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 

base/glibc-compatibility/musl/powf.c

@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <math.h>
 #include <stdint.h>
 #include "libm.h"

base/loggers/CMakeLists.txt

@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(loggers .)
 add_library(loggers ${loggers_sources} ${loggers_headers})
 target_link_libraries(loggers PRIVATE dbms clickhouse_common_io)

base/loggers/Loggers.cpp

@@ -40,7 +40,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
             split->addTextLog(log, text_log_max_priority);
 
     auto current_logger = config.getString("logger", "");
-    if (config_logger == current_logger)
+    if (config_logger == current_logger) //-V1051
         return;
 
     config_logger = current_logger;
@@ -51,12 +51,22 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     /// Use extended interface of Channel for more comprehensive logging.
     split = new DB::OwnSplitChannel();
 
-    auto log_level = config.getString("logger.level", "trace");
+    auto log_level_string = config.getString("logger.level", "trace");
+
+    /// different channels (log, console, syslog) may have different loglevels configured
+    /// The maximum (the most verbose) of those will be used as default for Poco loggers
+    int max_log_level = 0;
+
     const auto log_path = config.getString("logger.log", "");
     if (!log_path.empty())
     {
         createDirectory(log_path);
-        std::cerr << "Logging " << log_level << " to " << log_path << std::endl;
+        std::cerr << "Logging " << log_level_string << " to " << log_path << std::endl;
+        auto log_level = Poco::Logger::parseLevel(log_level_string);
+        if (log_level > max_log_level)
+        {
+            max_log_level = log_level;
+        }
 
         // Set up two channel chains.
         log_file = new Poco::FileChannel;
@@ -69,9 +79,10 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
         log_file->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
+        log->setLevel(log_level);
         split->addChannel(log);
     }
 
@@ -79,6 +90,15 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     if (!errorlog_path.empty())
     {
         createDirectory(errorlog_path);
+
+        // NOTE: we don't use notice & critical in the code, so in practice error log collects fatal & error & warning.
+        // (!) Warnings are important, they require attention and should never be silenced / ignored.
+        auto errorlog_level = Poco::Logger::parseLevel(config.getString("logger.errorlog_level", "notice"));
+        if (errorlog_level > max_log_level)
+        {
+            max_log_level = errorlog_level;
+        }
+
         std::cerr << "Logging errors to " << errorlog_path << std::endl;
 
         error_log_file = new Poco::FileChannel;
@@ -90,20 +110,22 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         error_log_file->setProperty(Poco::FileChannel::PROP_FLUSH, config.getRawString("logger.flush", "true"));
         error_log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
-        errorlog->setLevel(Poco::Message::PRIO_NOTICE);
+        errorlog->setLevel(errorlog_level);
         errorlog->open();
         split->addChannel(errorlog);
     }
 
-    /// "dynamic_layer_selection" is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    /// We don't need this configuration parameter.
-
-    if (config.getBool("logger.use_syslog", false) || config.getBool("dynamic_layer_selection", false))
+    if (config.getBool("logger.use_syslog", false))
     {
         //const std::string & cmd_name = commandName();
+        auto syslog_level = Poco::Logger::parseLevel(config.getString("logger.syslog_level", log_level_string));
+        if (syslog_level > max_log_level)
+        {
+            max_log_level = syslog_level;
+        }
 
         if (config.has("logger.syslog.address"))
         {
@@ -127,9 +149,11 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         }
         syslog_channel->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_LAYER_TAG);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
+        log->setLevel(syslog_level);
+
         split->addChannel(log);
     }
 
@@ -141,9 +165,17 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     {
         bool color_enabled = config.getBool("logger.color_terminal", color_logs_by_default);
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_NOTHING, color_enabled);
+        auto console_log_level_string = config.getString("logger.console_log_level", log_level_string);
+        auto console_log_level = Poco::Logger::parseLevel(console_log_level_string);
+        if (console_log_level > max_log_level)
+        {
+            max_log_level = console_log_level;
+        }
+
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(color_enabled);
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
-        logger.warning("Logging " + log_level + " to console");
+        logger.warning("Logging " + console_log_level_string + " to console");
+        log->setLevel(console_log_level);
         split->addChannel(log);
     }
 
@@ -152,17 +184,17 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     logger.setChannel(split);
 
     // Global logging level (it can be overridden for specific loggers).
-    logger.setLevel(log_level);
+    logger.setLevel(max_log_level);
 
     // Set level to all already created loggers
     std::vector<std::string> names;
     //logger_root = Logger::root();
     logger.root().names(names);
     for (const auto & name : names)
-        logger.root().get(name).setLevel(log_level);
+        logger.root().get(name).setLevel(max_log_level);
 
     // Attach to the root logger.
-    logger.root().setLevel(log_level);
+    logger.root().setLevel(max_log_level);
     logger.root().setChannel(logger.getChannel());
 
     // Explicitly specified log levels for specific loggers.

base/loggers/Loggers.h

@@ -8,6 +8,7 @@
 #include <Interpreters/TextLog.h>
 #include "OwnSplitChannel.h"
 
+
 namespace Poco::Util
 {
     class AbstractConfiguration;
@@ -21,16 +22,8 @@ public:
     /// Close log files. On next log write files will be reopened.
     void closeLogs(Poco::Logger & logger);
 
-    std::optional<size_t> getLayer() const
-    {
-        return layer; /// layer set in inheritor class BaseDaemonApplication.
-    }
-
     void setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);
 
-protected:
-    std::optional<size_t> layer;
-
 private:
     Poco::AutoPtr<Poco::FileChannel> log_file;
     Poco::AutoPtr<Poco::FileChannel> error_log_file;

base/loggers/OwnFormattingChannel.h

@@ -22,6 +22,9 @@ public:
 
     void setLevel(Poco::Message::Priority priority_) { priority = priority_; }
 
+    // Poco::Logger::parseLevel returns ints
+    void setLevel(int level) { priority = static_cast<Poco::Message::Priority>(level); }
+
     void open() override
     {
         if (pChannel)

base/loggers/OwnPatternFormatter.cpp

@@ -13,31 +13,18 @@
 #include "Loggers.h"
 
 
-OwnPatternFormatter::OwnPatternFormatter(const Loggers * loggers_, OwnPatternFormatter::Options options_, bool color_)
-    : Poco::PatternFormatter(""), loggers(loggers_), options(options_), color(color_)
+OwnPatternFormatter::OwnPatternFormatter(bool color_)
+    : Poco::PatternFormatter(""), color(color_)
 {
 }
 
 
-void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text)
+void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const
 {
     DB::WriteBufferFromString wb(text);
 
     const Poco::Message & msg = msg_ext.base;
 
-    /// For syslog: tag must be before message and first whitespace.
-    /// This code is only used in Yandex.Metrika and unneeded in ClickHouse.
-    if ((options & ADD_LAYER_TAG) && loggers)
-    {
-        auto layer = loggers->getLayer();
-        if (layer)
-        {
-            writeCString("layer[", wb);
-            DB::writeIntText(*layer, wb);
-            writeCString("]: ", wb);
-        }
-    }
-
     /// Change delimiters in date for compatibility with old logs.
     DB::writeDateTimeText<'.', ':'>(msg_ext.time_seconds, wb);
 

base/loggers/OwnPatternFormatter.h

@@ -24,20 +24,11 @@ class Loggers;
 class OwnPatternFormatter : public Poco::PatternFormatter
 {
 public:
-    /// ADD_LAYER_TAG is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    enum Options
-    {
-        ADD_NOTHING = 0,
-        ADD_LAYER_TAG = 1 << 0
-    };
-
-    OwnPatternFormatter(const Loggers * loggers_, Options options_ = ADD_NOTHING, bool color_ = false);
+    OwnPatternFormatter(bool color_ = false);
 
     void format(const Poco::Message & msg, std::string & text) override;
-    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text);
+    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
 
 private:
-    const Loggers * loggers;
-    Options options;
     bool color;
 };

base/mysqlxx/CMakeLists.txt

@@ -14,8 +14,8 @@ add_library (mysqlxx
 target_include_directories (mysqlxx PUBLIC ..)
 
 if (USE_INTERNAL_MYSQL_LIBRARY)
-    target_include_directories (mysqlxx PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/include)
-    target_include_directories (mysqlxx PUBLIC ${ClickHouse_BINARY_DIR}/contrib/mariadb-connector-c/include)
+    target_include_directories (mysqlxx PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/include")
+    target_include_directories (mysqlxx PUBLIC "${ClickHouse_BINARY_DIR}/contrib/mariadb-connector-c/include")
 else ()
     set(PLATFORM_LIBRARIES ${CMAKE_DL_LIBS})
 

base/mysqlxx/Pool.h

@@ -159,9 +159,9 @@ public:
       */
     Pool(const std::string & db_,
          const std::string & server_,
-         const std::string & user_ = "",
-         const std::string & password_ = "",
-         unsigned port_ = 0,
+         const std::string & user_,
+         const std::string & password_,
+         unsigned port_,
          const std::string & socket_ = "",
          unsigned connect_timeout_ = MYSQLXX_DEFAULT_TIMEOUT,
          unsigned rw_timeout_ = MYSQLXX_DEFAULT_RW_TIMEOUT,

base/pcg-random/pcg_extras.hpp

@@ -447,69 +447,6 @@ inline SrcIter uneven_copy(SrcIter src_first,
                             std::integral_constant<bool, DEST_IS_SMALLER>{});
 }
 
-/* generate_to, fill in a fixed-size array of integral type using a SeedSeq
- * (actually works for any random-access iterator)
- */
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                             std::true_type)
-{
-    generator.generate(dest, dest+size);
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                      std::false_type)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr auto DEST_SIZE = sizeof(dest_t);
-    constexpr auto GEN_SIZE  = sizeof(uint32_t);
-
-    constexpr bool GEN_IS_SMALLER = GEN_SIZE < DEST_SIZE;
-    constexpr size_t FROM_ELEMS =
-        GEN_IS_SMALLER
-            ? size * ((DEST_SIZE+GEN_SIZE-1) / GEN_SIZE)
-            : (size + (GEN_SIZE / DEST_SIZE) - 1)
-                / ((GEN_SIZE / DEST_SIZE) + GEN_IS_SMALLER);
-                        //  this odd code ^^^^^^^^^^^^^^^^^ is work-around for
-                        //  a bug: http://llvm.org/bugs/show_bug.cgi?id=21287
-
-    if (FROM_ELEMS <= 1024) {
-        uint32_t buffer[FROM_ELEMS];
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-    } else {
-        uint32_t* buffer = static_cast<uint32_t*>(malloc(GEN_SIZE * FROM_ELEMS));
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-        free(static_cast<void*>(buffer));
-    }
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to(SeedSeq&& generator, DestIter dest)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr bool IS_32BIT = sizeof(dest_t) == sizeof(uint32_t);
-
-    generate_to_impl<size>(std::forward<SeedSeq>(generator), dest,
-                           std::integral_constant<bool, IS_32BIT>{});
-}
-
-/* generate_one, produce a value of integral type using a SeedSeq
- * (optionally, we can have it produce more than one and pick which one
- * we want)
- */
-
-template <typename UInt, size_t i = 0UL, size_t N = i+1UL, typename SeedSeq>
-inline UInt generate_one(SeedSeq&& generator)
-{
-    UInt result[N];
-    generate_to<N>(std::forward<SeedSeq>(generator), result);
-    return result[i];
-}
-
 template <typename RngType>
 auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
         -> typename RngType::result_type
@@ -517,7 +454,7 @@ auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
     typedef typename RngType::result_type rtype;
     rtype threshold = (RngType::max() - RngType::min() + rtype(1) - upper_bound)
                     % upper_bound;
-    for (;;) {
+    for (;;) { //-V1044
         rtype r = rng() - RngType::min();
         if (r >= threshold)
             return r % upper_bound;

base/pcg-random/pcg_random.hpp

@@ -928,7 +928,7 @@ struct rxs_m_xs_mixin {
         constexpr bitcount_t shift = bits - xtypebits;
         constexpr bitcount_t mask = (1 << opbits) - 1;
         bitcount_t rshift =
-            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0;
+            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0; //-V547
         internal ^= internal >> (opbits + rshift);
         internal *= mcg_multiplier<itype>::multiplier();
         xtype result = internal >> shift;
@@ -950,7 +950,7 @@ struct rxs_m_xs_mixin {
 
         internal *= mcg_unmultiplier<itype>::unmultiplier();
 
-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
         internal = unxorshift(internal, bits, opbits + rshift);
 
         return internal;
@@ -975,7 +975,7 @@ struct rxs_m_mixin {
                                  :                    2;
         constexpr bitcount_t shift = bits - xtypebits;
         constexpr bitcount_t mask = (1 << opbits) - 1;
-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
         internal ^= internal >> (opbits + rshift);
         internal *= mcg_multiplier<itype>::multiplier();
         xtype result = internal >> shift;
@@ -1366,7 +1366,7 @@ void extended<table_pow2,advance_pow2,baseclass,extvalclass,kdd>::selfinit()
     //      - any strange correlations would only be apparent if we
     //        were to backstep the generator so that the base generator
     //        was generating the same values again
-    result_type xdiff = baseclass::operator()() - baseclass::operator()();
+    result_type xdiff = baseclass::operator()() - baseclass::operator()(); //-V501
     for (size_t i = 0; i < table_size; ++i) {
         data_[i] = baseclass::operator()() ^ xdiff;
     }
@@ -1643,22 +1643,22 @@ typedef setseq_base<pcg128_t, pcg128_t, xsl_rr_rr_mixin>
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std8 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std8 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                           oneseq_rxs_m_xs_8_8, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std16 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std16 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_16_16, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std32 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std32 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_32_32, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std64 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std64 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_64_64, kdd>;
 
 

cmake/autogenerated_versions.txt

@@ -1,9 +1,9 @@
 # This strings autochanged from release_lib.sh:
-SET(VERSION_REVISION 54450)
+SET(VERSION_REVISION 54451)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 5)
+SET(VERSION_MINOR 6)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 3827789b3d8fd2021952e57e5110343d26daa1a1)
-SET(VERSION_DESCRIBE v21.5.1.1-prestable)
-SET(VERSION_STRING 21.5.1.1)
+SET(VERSION_GITHASH 96fced4c3cf432fb0b401d2ab01f0c56e5f74a96)
+SET(VERSION_DESCRIBE v21.6.1.1-prestable)
+SET(VERSION_STRING 21.6.1.1)
 # end of autochange

cmake/check_flags.cmake

@@ -0,0 +1,6 @@
+include (CheckCXXCompilerFlag)
+include (CheckCCompilerFlag)
+
+check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
+check_cxx_compiler_flag("-Wshadow" HAS_SHADOW)
+check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)

cmake/find/amqpcpp.cmake

@@ -1,5 +1,5 @@
-if (OS_DARWIN AND COMPILER_GCC)
-    # AMQP-CPP requires libuv which cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082
+if (MISSING_INTERNAL_LIBUV_LIBRARY)
+    message (WARNING "Can't find internal libuv needed for AMQP-CPP library")
     set (ENABLE_AMQPCPP OFF CACHE INTERNAL "")
 endif()
 
@@ -17,11 +17,13 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/CMakeLists.txt")
 endif ()
 
 set (USE_AMQPCPP 1)
-set (AMQPCPP_LIBRARY AMQP-CPP)
+set (AMQPCPP_LIBRARY 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"
+        "${LIBUV_INCLUDE_DIR}"
         "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 
+list (APPEND AMQPCPP_LIBRARY  "${LIBUV_LIBRARY}")
+
 message (STATUS "Using AMQP-CPP=${USE_AMQPCPP}: ${AMQPCPP_INCLUDE_DIR} : ${AMQPCPP_LIBRARY}")

cmake/find/cassandra.cmake

@@ -1,5 +1,5 @@
-if (OS_DARWIN AND COMPILER_GCC)
-    # Cassandra requires libuv which cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082
+if (MISSING_INTERNAL_LIBUV_LIBRARY)
+    message (WARNING "Disabling cassandra due to missing libuv")
     set (ENABLE_CASSANDRA OFF CACHE INTERNAL "")
 endif()
 
@@ -13,27 +13,22 @@ if (APPLE)
     set(CMAKE_MACOSX_RPATH ON)
 endif()
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-    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")
+if (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 (CASSANDRA_LIBRARY cassandra)
-    endif()
-
-    set (USE_CASSANDRA 1)
-    set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
+    set (USE_CASSANDRA 0)
+    return()
 endif()
 
+set (USE_CASSANDRA 1)
+set (CASSANDRA_INCLUDE_DIR
+        "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
+if (MAKE_STATIC_LIBRARIES)
+    set (CASSANDRA_LIBRARY cassandra_static)
+else()
+    set (CASSANDRA_LIBRARY cassandra)
+endif()
+
+set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
+
 message (STATUS "Using cassandra=${USE_CASSANDRA}: ${CASSANDRA_INCLUDE_DIR} : ${CASSANDRA_LIBRARY}")
-message (STATUS "Using libuv: ${LIBUV_ROOT_DIR} : ${LIBUV_LIBRARY}")

cmake/find/libuv.cmake

@@ -0,0 +1,22 @@
+if (OS_DARWIN AND COMPILER_GCC)
+    message (WARNING "libuv cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082")
+    SET(MISSING_INTERNAL_LIBUV_LIBRARY 1)
+    return()
+endif()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
+    message (WARNING "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
+    SET(MISSING_INTERNAL_LIBUV_LIBRARY 1)
+    return()
+endif()
+
+if (MAKE_STATIC_LIBRARIES)
+    set (LIBUV_LIBRARY uv_a)
+else()
+    set (LIBUV_LIBRARY uv)
+endif()
+
+set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
+set (LIBUV_INCLUDE_DIR "${LIBUV_ROOT_DIR}/include")
+
+message (STATUS "Using libuv: ${LIBUV_ROOT_DIR} : ${LIBUV_LIBRARY}")

cmake/find/llvm.cmake

@@ -2,7 +2,7 @@ if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64)
     set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
 endif()
 
-option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile_expressions' option for query execution" ${ENABLE_LIBRARIES})
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
 # Broken in macos. TODO: update clang, re-test, enable on Apple
 if (ENABLE_EMBEDDED_COMPILER AND NOT SPLIT_SHARED_LIBRARIES AND ARCH_AMD64 AND NOT (SANITIZE STREQUAL "undefined"))
     option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library." ${NOT_UNBUNDLED})
@@ -24,9 +24,9 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
 endif ()
 
 if (NOT USE_INTERNAL_LLVM_LIBRARY)
-    set (LLVM_PATHS "/usr/local/lib/llvm")
+    set (LLVM_PATHS "/usr/local/lib/llvm" "/usr/lib/llvm")
 
-    foreach(llvm_v 10 9 8)
+    foreach(llvm_v 11.1 11)
         if (NOT LLVM_FOUND)
             find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
         endif ()
@@ -102,7 +102,6 @@ LLVMRuntimeDyld
 LLVMX86CodeGen
 LLVMX86Desc
 LLVMX86Info
-LLVMX86Utils
 LLVMAsmPrinter
 LLVMDebugInfoDWARF
 LLVMGlobalISel

cmake/find/nanodbc.cmake

@@ -1,35 +1,16 @@
-option(ENABLE_NANODBC "Enalbe nanodbc" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_NANODBC)
-    set (USE_ODBC 0)
-    return()
-endif()
-
 if (NOT ENABLE_ODBC)
-    set (USE_NANODBC 0)
-    message (STATUS "Using nanodbc=${USE_NANODBC}")
-    return()
-endif()
+    return ()
+endif ()
+
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    message (FATAL_ERROR "Only the bundled nanodbc library can be used")
+endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/CMakeLists.txt")
-    message (WARNING "submodule contrib/nanodbc is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal nanodbc library")
-    set (USE_NANODBC 0)
-    return()
+    message (FATAL_ERROR "submodule contrib/nanodbc is missing. to fix try run: \n git submodule update --init --recursive")
 endif()
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/unixodbc/include")
-    message (ERROR "submodule contrib/unixodbc is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal unixodbc needed for nanodbc")
-    set (USE_NANODBC 0)
-    return()
-endif()
-
-set (USE_NANODBC 1)
-
 set (NANODBC_LIBRARY nanodbc)
+set (NANODBC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/nanodbc")
 
-set (NANODBC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/nanodbce")
-
-message (STATUS "Using nanodbc=${USE_NANODBC}: ${NANODBC_INCLUDE_DIR} : ${NANODBC_LIBRARY}")
-message (STATUS "Using unixodbc")
+message (STATUS "Using nanodbc: ${NANODBC_INCLUDE_DIR} : ${NANODBC_LIBRARY}")

cmake/find/odbc.cmake

@@ -50,4 +50,6 @@ if (NOT EXTERNAL_ODBC_LIBRARY_FOUND)
     set (USE_INTERNAL_ODBC_LIBRARY 1)
 endif ()
 
+set (USE_INTERNAL_NANODBC_LIBRARY 1)
+
 message (STATUS "Using unixodbc")

cmake/sanitize.cmake

@@ -40,7 +40,7 @@ if (SANITIZE)
         # RelWithDebInfo, and downgrade optimizations to -O1 but not to -Og, to
         # keep the binary size down.
         # TODO: try compiling with -Og and with ld.gold.
-        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
+        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
 
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")

cmake/target.cmake

@@ -12,6 +12,9 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
     set (OS_DARWIN 1)
     add_definitions(-D OS_DARWIN)
+elseif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    set (OS_SUNOS 1)
+    add_definitions(-D OS_SUNOS)
 endif ()
 
 if (CMAKE_CROSSCOMPILING)

cmake/tools.cmake

@@ -8,10 +8,13 @@ endif ()
 
 if (COMPILER_GCC)
     # Require minimum version of gcc
-    set (GCC_MINIMUM_VERSION 9)
+    set (GCC_MINIMUM_VERSION 10)
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GCC_MINIMUM_VERSION} AND NOT CMAKE_VERSION VERSION_LESS 2.8.9)
         message (FATAL_ERROR "GCC version must be at least ${GCC_MINIMUM_VERSION}. For example, if GCC ${GCC_MINIMUM_VERSION} is available under gcc-${GCC_MINIMUM_VERSION}, g++-${GCC_MINIMUM_VERSION} names, do the following: export CC=gcc-${GCC_MINIMUM_VERSION} CXX=g++-${GCC_MINIMUM_VERSION}; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
     endif ()
+
+    message (WARNING "GCC compiler is not officially supported for ClickHouse. You should migrate to clang.")
+
 elseif (COMPILER_CLANG)
     # Require minimum version of clang/apple-clang
     if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")

cmake/warnings.cmake

@@ -171,6 +171,7 @@ elseif (COMPILER_GCC)
     add_cxx_compile_options(-Wtrampolines)
     # Obvious
     add_cxx_compile_options(-Wunused)
+    add_cxx_compile_options(-Wundef)
     # Warn if vector operation is not implemented via SIMD capabilities of the architecture
     add_cxx_compile_options(-Wvector-operation-performance)
     # XXX: libstdc++ has some of these for 3way compare

contrib/CMakeLists.txt

@@ -1,4 +1,3 @@
-# Third-party libraries may have substandard code.
 
 # Put all targets defined here and in added subfolders under "contrib/" folder in GUI-based IDEs by default.
 # Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they will
@@ -11,8 +10,10 @@ else ()
 endif ()
 unset (_current_dir_name)
 
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+# Third-party libraries may have substandard code.
+# Also remove a possible source of nondeterminism.
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w -D__DATE__= -D__TIME__= -D__TIMESTAMP__=")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -D__DATE__= -D__TIME__= -D__TIMESTAMP__=")
 
 if (WITH_COVERAGE)
   set (WITHOUT_COVERAGE_LIST ${WITHOUT_COVERAGE})
@@ -47,6 +48,7 @@ add_subdirectory (lz4-cmake)
 add_subdirectory (murmurhash)
 add_subdirectory (replxx-cmake)
 add_subdirectory (unixodbc-cmake)
+add_subdirectory (nanodbc-cmake)
 
 if (USE_INTERNAL_XZ_LIBRARY)
     add_subdirectory (xz)
@@ -320,10 +322,6 @@ if (USE_LIBPQXX)
     add_subdirectory (libpqxx-cmake)
 endif()
 
-if (USE_NANODBC)
-    add_subdirectory (nanodbc-cmake)
-endif()
-
 if (USE_NURAFT)
   add_subdirectory(nuraft-cmake)
 endif()

contrib/NuRaft

@@ -1 +1 @@
-Subproject commit 377f8e77491d9f66ce8e32e88aae19dffe8dc4d7
+Subproject commit 95d6bbba579b3a4e4c2dede954f541ff6f3dba51

contrib/amqpcpp-cmake/CMakeLists.txt

@@ -1,25 +1,25 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 
 set (SRCS
-    ${LIBRARY_DIR}/src/array.cpp
-    ${LIBRARY_DIR}/src/channel.cpp
-    ${LIBRARY_DIR}/src/channelimpl.cpp
-    ${LIBRARY_DIR}/src/connectionimpl.cpp
-    ${LIBRARY_DIR}/src/deferredcancel.cpp
-    ${LIBRARY_DIR}/src/deferredconfirm.cpp
-    ${LIBRARY_DIR}/src/deferredconsumer.cpp
-    ${LIBRARY_DIR}/src/deferredextreceiver.cpp
-    ${LIBRARY_DIR}/src/deferredget.cpp
-    ${LIBRARY_DIR}/src/deferredpublisher.cpp
-    ${LIBRARY_DIR}/src/deferredreceiver.cpp
-    ${LIBRARY_DIR}/src/field.cpp
-    ${LIBRARY_DIR}/src/flags.cpp
-    ${LIBRARY_DIR}/src/linux_tcp/openssl.cpp
-    ${LIBRARY_DIR}/src/linux_tcp/tcpconnection.cpp
-    ${LIBRARY_DIR}/src/inbuffer.cpp
-    ${LIBRARY_DIR}/src/receivedframe.cpp
-    ${LIBRARY_DIR}/src/table.cpp
-    ${LIBRARY_DIR}/src/watchable.cpp
+    "${LIBRARY_DIR}/src/array.cpp"
+    "${LIBRARY_DIR}/src/channel.cpp"
+    "${LIBRARY_DIR}/src/channelimpl.cpp"
+    "${LIBRARY_DIR}/src/connectionimpl.cpp"
+    "${LIBRARY_DIR}/src/deferredcancel.cpp"
+    "${LIBRARY_DIR}/src/deferredconfirm.cpp"
+    "${LIBRARY_DIR}/src/deferredconsumer.cpp"
+    "${LIBRARY_DIR}/src/deferredextreceiver.cpp"
+    "${LIBRARY_DIR}/src/deferredget.cpp"
+    "${LIBRARY_DIR}/src/deferredpublisher.cpp"
+    "${LIBRARY_DIR}/src/deferredreceiver.cpp"
+    "${LIBRARY_DIR}/src/field.cpp"
+    "${LIBRARY_DIR}/src/flags.cpp"
+    "${LIBRARY_DIR}/src/linux_tcp/openssl.cpp"
+    "${LIBRARY_DIR}/src/linux_tcp/tcpconnection.cpp"
+    "${LIBRARY_DIR}/src/inbuffer.cpp"
+    "${LIBRARY_DIR}/src/receivedframe.cpp"
+    "${LIBRARY_DIR}/src/table.cpp"
+    "${LIBRARY_DIR}/src/watchable.cpp"
 )
 
 add_library(amqp-cpp ${SRCS})
@@ -39,7 +39,7 @@ target_compile_options (amqp-cpp
         -w
 )
 
-target_include_directories (amqp-cpp SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories (amqp-cpp SYSTEM PUBLIC "${LIBRARY_DIR}/include")
 
 target_link_libraries (amqp-cpp PUBLIC ssl)
 

contrib/antlr4-runtime-cmake/CMakeLists.txt

@@ -1,154 +1,154 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/antlr4-runtime)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/antlr4-runtime")
 
 set (SRCS
-    ${LIBRARY_DIR}/ANTLRErrorListener.cpp
-    ${LIBRARY_DIR}/ANTLRErrorStrategy.cpp
-    ${LIBRARY_DIR}/ANTLRFileStream.cpp
-    ${LIBRARY_DIR}/ANTLRInputStream.cpp
-    ${LIBRARY_DIR}/atn/AbstractPredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/ActionTransition.cpp
-    ${LIBRARY_DIR}/atn/AmbiguityInfo.cpp
-    ${LIBRARY_DIR}/atn/ArrayPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/ATN.cpp
-    ${LIBRARY_DIR}/atn/ATNConfig.cpp
-    ${LIBRARY_DIR}/atn/ATNConfigSet.cpp
-    ${LIBRARY_DIR}/atn/ATNDeserializationOptions.cpp
-    ${LIBRARY_DIR}/atn/ATNDeserializer.cpp
-    ${LIBRARY_DIR}/atn/ATNSerializer.cpp
-    ${LIBRARY_DIR}/atn/ATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/ATNState.cpp
-    ${LIBRARY_DIR}/atn/AtomTransition.cpp
-    ${LIBRARY_DIR}/atn/BasicBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/BasicState.cpp
-    ${LIBRARY_DIR}/atn/BlockEndState.cpp
-    ${LIBRARY_DIR}/atn/BlockStartState.cpp
-    ${LIBRARY_DIR}/atn/ContextSensitivityInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionEventInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionState.cpp
-    ${LIBRARY_DIR}/atn/EmptyPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/EpsilonTransition.cpp
-    ${LIBRARY_DIR}/atn/ErrorInfo.cpp
-    ${LIBRARY_DIR}/atn/LexerAction.cpp
-    ${LIBRARY_DIR}/atn/LexerActionExecutor.cpp
-    ${LIBRARY_DIR}/atn/LexerATNConfig.cpp
-    ${LIBRARY_DIR}/atn/LexerATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/LexerChannelAction.cpp
-    ${LIBRARY_DIR}/atn/LexerCustomAction.cpp
-    ${LIBRARY_DIR}/atn/LexerIndexedCustomAction.cpp
-    ${LIBRARY_DIR}/atn/LexerModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerMoreAction.cpp
-    ${LIBRARY_DIR}/atn/LexerPopModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerPushModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerSkipAction.cpp
-    ${LIBRARY_DIR}/atn/LexerTypeAction.cpp
-    ${LIBRARY_DIR}/atn/LL1Analyzer.cpp
-    ${LIBRARY_DIR}/atn/LookaheadEventInfo.cpp
-    ${LIBRARY_DIR}/atn/LoopEndState.cpp
-    ${LIBRARY_DIR}/atn/NotSetTransition.cpp
-    ${LIBRARY_DIR}/atn/OrderedATNConfigSet.cpp
-    ${LIBRARY_DIR}/atn/ParseInfo.cpp
-    ${LIBRARY_DIR}/atn/ParserATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/PlusBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/PlusLoopbackState.cpp
-    ${LIBRARY_DIR}/atn/PrecedencePredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/PredicateEvalInfo.cpp
-    ${LIBRARY_DIR}/atn/PredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/PredictionContext.cpp
-    ${LIBRARY_DIR}/atn/PredictionMode.cpp
-    ${LIBRARY_DIR}/atn/ProfilingATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/RangeTransition.cpp
-    ${LIBRARY_DIR}/atn/RuleStartState.cpp
-    ${LIBRARY_DIR}/atn/RuleStopState.cpp
-    ${LIBRARY_DIR}/atn/RuleTransition.cpp
-    ${LIBRARY_DIR}/atn/SemanticContext.cpp
-    ${LIBRARY_DIR}/atn/SetTransition.cpp
-    ${LIBRARY_DIR}/atn/SingletonPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/StarBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/StarLoopbackState.cpp
-    ${LIBRARY_DIR}/atn/StarLoopEntryState.cpp
-    ${LIBRARY_DIR}/atn/TokensStartState.cpp
-    ${LIBRARY_DIR}/atn/Transition.cpp
-    ${LIBRARY_DIR}/atn/WildcardTransition.cpp
-    ${LIBRARY_DIR}/BailErrorStrategy.cpp
-    ${LIBRARY_DIR}/BaseErrorListener.cpp
-    ${LIBRARY_DIR}/BufferedTokenStream.cpp
-    ${LIBRARY_DIR}/CharStream.cpp
-    ${LIBRARY_DIR}/CommonToken.cpp
-    ${LIBRARY_DIR}/CommonTokenFactory.cpp
-    ${LIBRARY_DIR}/CommonTokenStream.cpp
-    ${LIBRARY_DIR}/ConsoleErrorListener.cpp
-    ${LIBRARY_DIR}/DefaultErrorStrategy.cpp
-    ${LIBRARY_DIR}/dfa/DFA.cpp
-    ${LIBRARY_DIR}/dfa/DFASerializer.cpp
-    ${LIBRARY_DIR}/dfa/DFAState.cpp
-    ${LIBRARY_DIR}/dfa/LexerDFASerializer.cpp
-    ${LIBRARY_DIR}/DiagnosticErrorListener.cpp
-    ${LIBRARY_DIR}/Exceptions.cpp
-    ${LIBRARY_DIR}/FailedPredicateException.cpp
-    ${LIBRARY_DIR}/InputMismatchException.cpp
-    ${LIBRARY_DIR}/InterpreterRuleContext.cpp
-    ${LIBRARY_DIR}/IntStream.cpp
-    ${LIBRARY_DIR}/Lexer.cpp
-    ${LIBRARY_DIR}/LexerInterpreter.cpp
-    ${LIBRARY_DIR}/LexerNoViableAltException.cpp
-    ${LIBRARY_DIR}/ListTokenSource.cpp
-    ${LIBRARY_DIR}/misc/InterpreterDataReader.cpp
-    ${LIBRARY_DIR}/misc/Interval.cpp
-    ${LIBRARY_DIR}/misc/IntervalSet.cpp
-    ${LIBRARY_DIR}/misc/MurmurHash.cpp
-    ${LIBRARY_DIR}/misc/Predicate.cpp
-    ${LIBRARY_DIR}/NoViableAltException.cpp
-    ${LIBRARY_DIR}/Parser.cpp
-    ${LIBRARY_DIR}/ParserInterpreter.cpp
-    ${LIBRARY_DIR}/ParserRuleContext.cpp
-    ${LIBRARY_DIR}/ProxyErrorListener.cpp
-    ${LIBRARY_DIR}/RecognitionException.cpp
-    ${LIBRARY_DIR}/Recognizer.cpp
-    ${LIBRARY_DIR}/RuleContext.cpp
-    ${LIBRARY_DIR}/RuleContextWithAltNum.cpp
-    ${LIBRARY_DIR}/RuntimeMetaData.cpp
-    ${LIBRARY_DIR}/support/Any.cpp
-    ${LIBRARY_DIR}/support/Arrays.cpp
-    ${LIBRARY_DIR}/support/CPPUtils.cpp
-    ${LIBRARY_DIR}/support/guid.cpp
-    ${LIBRARY_DIR}/support/StringUtils.cpp
-    ${LIBRARY_DIR}/Token.cpp
-    ${LIBRARY_DIR}/TokenSource.cpp
-    ${LIBRARY_DIR}/TokenStream.cpp
-    ${LIBRARY_DIR}/TokenStreamRewriter.cpp
-    ${LIBRARY_DIR}/tree/ErrorNode.cpp
-    ${LIBRARY_DIR}/tree/ErrorNodeImpl.cpp
-    ${LIBRARY_DIR}/tree/IterativeParseTreeWalker.cpp
-    ${LIBRARY_DIR}/tree/ParseTree.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeListener.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeVisitor.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeWalker.cpp
-    ${LIBRARY_DIR}/tree/pattern/Chunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreeMatch.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreePattern.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreePatternMatcher.cpp
-    ${LIBRARY_DIR}/tree/pattern/RuleTagToken.cpp
-    ${LIBRARY_DIR}/tree/pattern/TagChunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/TextChunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/TokenTagToken.cpp
-    ${LIBRARY_DIR}/tree/TerminalNode.cpp
-    ${LIBRARY_DIR}/tree/TerminalNodeImpl.cpp
-    ${LIBRARY_DIR}/tree/Trees.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPath.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathLexer.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathLexerErrorListener.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathRuleAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathRuleElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathTokenAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathTokenElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathWildcardAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathWildcardElement.cpp
-    ${LIBRARY_DIR}/UnbufferedCharStream.cpp
-    ${LIBRARY_DIR}/UnbufferedTokenStream.cpp
-    ${LIBRARY_DIR}/Vocabulary.cpp
-    ${LIBRARY_DIR}/WritableToken.cpp
+    "${LIBRARY_DIR}/ANTLRErrorListener.cpp"
+    "${LIBRARY_DIR}/ANTLRErrorStrategy.cpp"
+    "${LIBRARY_DIR}/ANTLRFileStream.cpp"
+    "${LIBRARY_DIR}/ANTLRInputStream.cpp"
+    "${LIBRARY_DIR}/atn/AbstractPredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/ActionTransition.cpp"
+    "${LIBRARY_DIR}/atn/AmbiguityInfo.cpp"
+    "${LIBRARY_DIR}/atn/ArrayPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/ATN.cpp"
+    "${LIBRARY_DIR}/atn/ATNConfig.cpp"
+    "${LIBRARY_DIR}/atn/ATNConfigSet.cpp"
+    "${LIBRARY_DIR}/atn/ATNDeserializationOptions.cpp"
+    "${LIBRARY_DIR}/atn/ATNDeserializer.cpp"
+    "${LIBRARY_DIR}/atn/ATNSerializer.cpp"
+    "${LIBRARY_DIR}/atn/ATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/ATNState.cpp"
+    "${LIBRARY_DIR}/atn/AtomTransition.cpp"
+    "${LIBRARY_DIR}/atn/BasicBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/BasicState.cpp"
+    "${LIBRARY_DIR}/atn/BlockEndState.cpp"
+    "${LIBRARY_DIR}/atn/BlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/ContextSensitivityInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionEventInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionState.cpp"
+    "${LIBRARY_DIR}/atn/EmptyPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/EpsilonTransition.cpp"
+    "${LIBRARY_DIR}/atn/ErrorInfo.cpp"
+    "${LIBRARY_DIR}/atn/LexerAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerActionExecutor.cpp"
+    "${LIBRARY_DIR}/atn/LexerATNConfig.cpp"
+    "${LIBRARY_DIR}/atn/LexerATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/LexerChannelAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerCustomAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerIndexedCustomAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerMoreAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerPopModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerPushModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerSkipAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerTypeAction.cpp"
+    "${LIBRARY_DIR}/atn/LL1Analyzer.cpp"
+    "${LIBRARY_DIR}/atn/LookaheadEventInfo.cpp"
+    "${LIBRARY_DIR}/atn/LoopEndState.cpp"
+    "${LIBRARY_DIR}/atn/NotSetTransition.cpp"
+    "${LIBRARY_DIR}/atn/OrderedATNConfigSet.cpp"
+    "${LIBRARY_DIR}/atn/ParseInfo.cpp"
+    "${LIBRARY_DIR}/atn/ParserATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/PlusBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/PlusLoopbackState.cpp"
+    "${LIBRARY_DIR}/atn/PrecedencePredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/PredicateEvalInfo.cpp"
+    "${LIBRARY_DIR}/atn/PredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/PredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/PredictionMode.cpp"
+    "${LIBRARY_DIR}/atn/ProfilingATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/RangeTransition.cpp"
+    "${LIBRARY_DIR}/atn/RuleStartState.cpp"
+    "${LIBRARY_DIR}/atn/RuleStopState.cpp"
+    "${LIBRARY_DIR}/atn/RuleTransition.cpp"
+    "${LIBRARY_DIR}/atn/SemanticContext.cpp"
+    "${LIBRARY_DIR}/atn/SetTransition.cpp"
+    "${LIBRARY_DIR}/atn/SingletonPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/StarBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/StarLoopbackState.cpp"
+    "${LIBRARY_DIR}/atn/StarLoopEntryState.cpp"
+    "${LIBRARY_DIR}/atn/TokensStartState.cpp"
+    "${LIBRARY_DIR}/atn/Transition.cpp"
+    "${LIBRARY_DIR}/atn/WildcardTransition.cpp"
+    "${LIBRARY_DIR}/BailErrorStrategy.cpp"
+    "${LIBRARY_DIR}/BaseErrorListener.cpp"
+    "${LIBRARY_DIR}/BufferedTokenStream.cpp"
+    "${LIBRARY_DIR}/CharStream.cpp"
+    "${LIBRARY_DIR}/CommonToken.cpp"
+    "${LIBRARY_DIR}/CommonTokenFactory.cpp"
+    "${LIBRARY_DIR}/CommonTokenStream.cpp"
+    "${LIBRARY_DIR}/ConsoleErrorListener.cpp"
+    "${LIBRARY_DIR}/DefaultErrorStrategy.cpp"
+    "${LIBRARY_DIR}/dfa/DFA.cpp"
+    "${LIBRARY_DIR}/dfa/DFASerializer.cpp"
+    "${LIBRARY_DIR}/dfa/DFAState.cpp"
+    "${LIBRARY_DIR}/dfa/LexerDFASerializer.cpp"
+    "${LIBRARY_DIR}/DiagnosticErrorListener.cpp"
+    "${LIBRARY_DIR}/Exceptions.cpp"
+    "${LIBRARY_DIR}/FailedPredicateException.cpp"
+    "${LIBRARY_DIR}/InputMismatchException.cpp"
+    "${LIBRARY_DIR}/InterpreterRuleContext.cpp"
+    "${LIBRARY_DIR}/IntStream.cpp"
+    "${LIBRARY_DIR}/Lexer.cpp"
+    "${LIBRARY_DIR}/LexerInterpreter.cpp"
+    "${LIBRARY_DIR}/LexerNoViableAltException.cpp"
+    "${LIBRARY_DIR}/ListTokenSource.cpp"
+    "${LIBRARY_DIR}/misc/InterpreterDataReader.cpp"
+    "${LIBRARY_DIR}/misc/Interval.cpp"
+    "${LIBRARY_DIR}/misc/IntervalSet.cpp"
+    "${LIBRARY_DIR}/misc/MurmurHash.cpp"
+    "${LIBRARY_DIR}/misc/Predicate.cpp"
+    "${LIBRARY_DIR}/NoViableAltException.cpp"
+    "${LIBRARY_DIR}/Parser.cpp"
+    "${LIBRARY_DIR}/ParserInterpreter.cpp"
+    "${LIBRARY_DIR}/ParserRuleContext.cpp"
+    "${LIBRARY_DIR}/ProxyErrorListener.cpp"
+    "${LIBRARY_DIR}/RecognitionException.cpp"
+    "${LIBRARY_DIR}/Recognizer.cpp"
+    "${LIBRARY_DIR}/RuleContext.cpp"
+    "${LIBRARY_DIR}/RuleContextWithAltNum.cpp"
+    "${LIBRARY_DIR}/RuntimeMetaData.cpp"
+    "${LIBRARY_DIR}/support/Any.cpp"
+    "${LIBRARY_DIR}/support/Arrays.cpp"
+    "${LIBRARY_DIR}/support/CPPUtils.cpp"
+    "${LIBRARY_DIR}/support/guid.cpp"
+    "${LIBRARY_DIR}/support/StringUtils.cpp"
+    "${LIBRARY_DIR}/Token.cpp"
+    "${LIBRARY_DIR}/TokenSource.cpp"
+    "${LIBRARY_DIR}/TokenStream.cpp"
+    "${LIBRARY_DIR}/TokenStreamRewriter.cpp"
+    "${LIBRARY_DIR}/tree/ErrorNode.cpp"
+    "${LIBRARY_DIR}/tree/ErrorNodeImpl.cpp"
+    "${LIBRARY_DIR}/tree/IterativeParseTreeWalker.cpp"
+    "${LIBRARY_DIR}/tree/ParseTree.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeListener.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeVisitor.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeWalker.cpp"
+    "${LIBRARY_DIR}/tree/pattern/Chunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreeMatch.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreePattern.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreePatternMatcher.cpp"
+    "${LIBRARY_DIR}/tree/pattern/RuleTagToken.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TagChunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TextChunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TokenTagToken.cpp"
+    "${LIBRARY_DIR}/tree/TerminalNode.cpp"
+    "${LIBRARY_DIR}/tree/TerminalNodeImpl.cpp"
+    "${LIBRARY_DIR}/tree/Trees.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPath.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathLexer.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathLexerErrorListener.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathRuleAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathRuleElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathTokenAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathTokenElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathWildcardAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathWildcardElement.cpp"
+    "${LIBRARY_DIR}/UnbufferedCharStream.cpp"
+    "${LIBRARY_DIR}/UnbufferedTokenStream.cpp"
+    "${LIBRARY_DIR}/Vocabulary.cpp"
+    "${LIBRARY_DIR}/WritableToken.cpp"
 )
 
 add_library (antlr4-runtime ${SRCS})

contrib/arrow-cmake/CMakeLists.txt

@@ -2,69 +2,69 @@ set (CMAKE_CXX_STANDARD 17)
 
 # === thrift
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp")
 # contrib/thrift/lib/cpp/CMakeLists.txt
 set(thriftcpp_SOURCES
-        ${LIBRARY_DIR}/src/thrift/TApplicationException.cpp
-        ${LIBRARY_DIR}/src/thrift/TOutput.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TAsyncChannel.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TAsyncProtocolProcessor.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.h
-        ${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/ThreadManager.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/TimerManager.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Util.cpp
-        ${LIBRARY_DIR}/src/thrift/processor/PeekProcessor.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TBase64Utils.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TDebugProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TJSONProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TMultiplexedProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TTransportException.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TFDTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSimpleFileTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpClient.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpServer.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSocket.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSocketPool.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TServerSocket.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TTransportUtils.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TBufferTransports.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TConnectedClient.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TServerFramework.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TSimpleServer.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TThreadPoolServer.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TThreadedServer.cpp
+        "${LIBRARY_DIR}/src/thrift/TApplicationException.cpp"
+        "${LIBRARY_DIR}/src/thrift/TOutput.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TAsyncChannel.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TAsyncProtocolProcessor.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.h"
+        "${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/ThreadManager.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/TimerManager.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Util.cpp"
+        "${LIBRARY_DIR}/src/thrift/processor/PeekProcessor.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TBase64Utils.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TDebugProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TJSONProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TMultiplexedProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TTransportException.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TFDTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSimpleFileTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpClient.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSocket.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSocketPool.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TServerSocket.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TTransportUtils.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TBufferTransports.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TConnectedClient.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TServerFramework.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TSimpleServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TThreadPoolServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TThreadedServer.cpp"
         )
 set(thriftcpp_threads_SOURCES
-        ${LIBRARY_DIR}/src/thrift/concurrency/ThreadFactory.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Thread.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Monitor.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Mutex.cpp
+        "${LIBRARY_DIR}/src/thrift/concurrency/ThreadFactory.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Thread.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Monitor.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Mutex.cpp"
         )
 add_library(${THRIFT_LIBRARY} ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
 set_target_properties(${THRIFT_LIBRARY} PROPERTIES CXX_STANDARD 14) # REMOVE after https://github.com/apache/thrift/pull/1641
-target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src)
+target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src")
 target_link_libraries (${THRIFT_LIBRARY} PRIVATE boost::headers_only)
 
 
 # === orc
 
-set(ORC_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/orc/c++)
-set(ORC_INCLUDE_DIR ${ORC_SOURCE_DIR}/include)
-set(ORC_SOURCE_SRC_DIR ${ORC_SOURCE_DIR}/src)
-set(ORC_SOURCE_WRAP_DIR ${ORC_SOURCE_DIR}/wrap)
+set(ORC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/orc/c++")
+set(ORC_INCLUDE_DIR "${ORC_SOURCE_DIR}/include")
+set(ORC_SOURCE_SRC_DIR "${ORC_SOURCE_DIR}/src")
+set(ORC_SOURCE_WRAP_DIR "${ORC_SOURCE_DIR}/wrap")
 
-set(ORC_BUILD_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src)
-set(ORC_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include)
+set(ORC_BUILD_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src")
+set(ORC_BUILD_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include")
 
-set(GOOGLE_PROTOBUF_DIR ${Protobuf_INCLUDE_DIR}/)
+set(GOOGLE_PROTOBUF_DIR "${Protobuf_INCLUDE_DIR}/")
 set(ORC_ADDITION_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(ARROW_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src)
+set(ARROW_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")
 
 set(PROTOBUF_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
-set(PROTO_DIR ${ORC_SOURCE_DIR}/../proto)
+set(PROTO_DIR "${ORC_SOURCE_DIR}/../proto")
 
 
 add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
@@ -75,9 +75,9 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
 
 
 # === flatbuffers
-set(FLATBUFFERS_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/flatbuffers)
-set(FLATBUFFERS_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/flatbuffers)
-set(FLATBUFFERS_INCLUDE_DIR ${FLATBUFFERS_SRC_DIR}/include)
+set(FLATBUFFERS_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/flatbuffers")
+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)
@@ -101,187 +101,187 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CXX11_FLAGS "-std=c++0x")
 endif ()
 
-include(${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake)
+include("${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake")
 include(orc_check.cmake)
 configure_file("${ORC_INCLUDE_DIR}/orc/orc-config.hh.in" "${ORC_BUILD_INCLUDE_DIR}/orc/orc-config.hh")
 configure_file("${ORC_SOURCE_SRC_DIR}/Adaptor.hh.in" "${ORC_BUILD_INCLUDE_DIR}/Adaptor.hh")
 
 
 set(ORC_SRCS
-        ${ARROW_SRC_DIR}/arrow/adapters/orc/adapter.cc
-        ${ARROW_SRC_DIR}/arrow/adapters/orc/adapter_util.cc
-        ${ORC_SOURCE_SRC_DIR}/Exceptions.cc
-        ${ORC_SOURCE_SRC_DIR}/OrcFile.cc
-        ${ORC_SOURCE_SRC_DIR}/Reader.cc
-        ${ORC_SOURCE_SRC_DIR}/ByteRLE.cc
-        ${ORC_SOURCE_SRC_DIR}/ColumnPrinter.cc
-        ${ORC_SOURCE_SRC_DIR}/ColumnReader.cc
-        ${ORC_SOURCE_SRC_DIR}/ColumnWriter.cc
-        ${ORC_SOURCE_SRC_DIR}/Common.cc
-        ${ORC_SOURCE_SRC_DIR}/Compression.cc
-        ${ORC_SOURCE_SRC_DIR}/Exceptions.cc
-        ${ORC_SOURCE_SRC_DIR}/Int128.cc
-        ${ORC_SOURCE_SRC_DIR}/LzoDecompressor.cc
-        ${ORC_SOURCE_SRC_DIR}/MemoryPool.cc
-        ${ORC_SOURCE_SRC_DIR}/OrcFile.cc
-        ${ORC_SOURCE_SRC_DIR}/Reader.cc
-        ${ORC_SOURCE_SRC_DIR}/RLE.cc
-        ${ORC_SOURCE_SRC_DIR}/RLEv1.cc
-        ${ORC_SOURCE_SRC_DIR}/RLEv2.cc
-        ${ORC_SOURCE_SRC_DIR}/Statistics.cc
-        ${ORC_SOURCE_SRC_DIR}/StripeStream.cc
-        ${ORC_SOURCE_SRC_DIR}/Timezone.cc
-        ${ORC_SOURCE_SRC_DIR}/TypeImpl.cc
-        ${ORC_SOURCE_SRC_DIR}/Vector.cc
-        ${ORC_SOURCE_SRC_DIR}/Writer.cc
-        ${ORC_SOURCE_SRC_DIR}/io/InputStream.cc
-        ${ORC_SOURCE_SRC_DIR}/io/OutputStream.cc
-        ${ORC_ADDITION_SOURCE_DIR}/orc_proto.pb.cc
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter.cc"
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter_util.cc"
+        "${ORC_SOURCE_SRC_DIR}/Exceptions.cc"
+        "${ORC_SOURCE_SRC_DIR}/OrcFile.cc"
+        "${ORC_SOURCE_SRC_DIR}/Reader.cc"
+        "${ORC_SOURCE_SRC_DIR}/ByteRLE.cc"
+        "${ORC_SOURCE_SRC_DIR}/ColumnPrinter.cc"
+        "${ORC_SOURCE_SRC_DIR}/ColumnReader.cc"
+        "${ORC_SOURCE_SRC_DIR}/ColumnWriter.cc"
+        "${ORC_SOURCE_SRC_DIR}/Common.cc"
+        "${ORC_SOURCE_SRC_DIR}/Compression.cc"
+        "${ORC_SOURCE_SRC_DIR}/Exceptions.cc"
+        "${ORC_SOURCE_SRC_DIR}/Int128.cc"
+        "${ORC_SOURCE_SRC_DIR}/LzoDecompressor.cc"
+        "${ORC_SOURCE_SRC_DIR}/MemoryPool.cc"
+        "${ORC_SOURCE_SRC_DIR}/OrcFile.cc"
+        "${ORC_SOURCE_SRC_DIR}/Reader.cc"
+        "${ORC_SOURCE_SRC_DIR}/RLE.cc"
+        "${ORC_SOURCE_SRC_DIR}/RLEv1.cc"
+        "${ORC_SOURCE_SRC_DIR}/RLEv2.cc"
+        "${ORC_SOURCE_SRC_DIR}/Statistics.cc"
+        "${ORC_SOURCE_SRC_DIR}/StripeStream.cc"
+        "${ORC_SOURCE_SRC_DIR}/Timezone.cc"
+        "${ORC_SOURCE_SRC_DIR}/TypeImpl.cc"
+        "${ORC_SOURCE_SRC_DIR}/Vector.cc"
+        "${ORC_SOURCE_SRC_DIR}/Writer.cc"
+        "${ORC_SOURCE_SRC_DIR}/io/InputStream.cc"
+        "${ORC_SOURCE_SRC_DIR}/io/OutputStream.cc"
+        "${ORC_ADDITION_SOURCE_DIR}/orc_proto.pb.cc"
         )
 
 
 # === arrow
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
 
 configure_file("${LIBRARY_DIR}/util/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cpp/src/arrow/util/config.h")
 
 # arrow/cpp/src/arrow/CMakeLists.txt
 set(ARROW_SRCS
-        ${LIBRARY_DIR}/buffer.cc
-        ${LIBRARY_DIR}/builder.cc
-        ${LIBRARY_DIR}/chunked_array.cc
-        ${LIBRARY_DIR}/compare.cc
-        ${LIBRARY_DIR}/datum.cc
-        ${LIBRARY_DIR}/device.cc
-        ${LIBRARY_DIR}/extension_type.cc
-        ${LIBRARY_DIR}/memory_pool.cc
-        ${LIBRARY_DIR}/pretty_print.cc
-        ${LIBRARY_DIR}/record_batch.cc
-        ${LIBRARY_DIR}/result.cc
-        ${LIBRARY_DIR}/scalar.cc
-        ${LIBRARY_DIR}/sparse_tensor.cc
-        ${LIBRARY_DIR}/status.cc
-        ${LIBRARY_DIR}/table_builder.cc
-        ${LIBRARY_DIR}/table.cc
-        ${LIBRARY_DIR}/tensor.cc
-        ${LIBRARY_DIR}/type.cc
-        ${LIBRARY_DIR}/visitor.cc
+        "${LIBRARY_DIR}/buffer.cc"
+        "${LIBRARY_DIR}/builder.cc"
+        "${LIBRARY_DIR}/chunked_array.cc"
+        "${LIBRARY_DIR}/compare.cc"
+        "${LIBRARY_DIR}/datum.cc"
+        "${LIBRARY_DIR}/device.cc"
+        "${LIBRARY_DIR}/extension_type.cc"
+        "${LIBRARY_DIR}/memory_pool.cc"
+        "${LIBRARY_DIR}/pretty_print.cc"
+        "${LIBRARY_DIR}/record_batch.cc"
+        "${LIBRARY_DIR}/result.cc"
+        "${LIBRARY_DIR}/scalar.cc"
+        "${LIBRARY_DIR}/sparse_tensor.cc"
+        "${LIBRARY_DIR}/status.cc"
+        "${LIBRARY_DIR}/table_builder.cc"
+        "${LIBRARY_DIR}/table.cc"
+        "${LIBRARY_DIR}/tensor.cc"
+        "${LIBRARY_DIR}/type.cc"
+        "${LIBRARY_DIR}/visitor.cc"
 
-        ${LIBRARY_DIR}/array/array_base.cc
-        ${LIBRARY_DIR}/array/array_binary.cc
-        ${LIBRARY_DIR}/array/array_decimal.cc
-        ${LIBRARY_DIR}/array/array_dict.cc
-        ${LIBRARY_DIR}/array/array_nested.cc
-        ${LIBRARY_DIR}/array/array_primitive.cc
-        ${LIBRARY_DIR}/array/builder_adaptive.cc
-        ${LIBRARY_DIR}/array/builder_base.cc
-        ${LIBRARY_DIR}/array/builder_binary.cc
-        ${LIBRARY_DIR}/array/builder_decimal.cc
-        ${LIBRARY_DIR}/array/builder_dict.cc
-        ${LIBRARY_DIR}/array/builder_nested.cc
-        ${LIBRARY_DIR}/array/builder_primitive.cc
-        ${LIBRARY_DIR}/array/builder_union.cc
-        ${LIBRARY_DIR}/array/concatenate.cc
-        ${LIBRARY_DIR}/array/data.cc
-        ${LIBRARY_DIR}/array/diff.cc
-        ${LIBRARY_DIR}/array/util.cc
-        ${LIBRARY_DIR}/array/validate.cc
+        "${LIBRARY_DIR}/array/array_base.cc"
+        "${LIBRARY_DIR}/array/array_binary.cc"
+        "${LIBRARY_DIR}/array/array_decimal.cc"
+        "${LIBRARY_DIR}/array/array_dict.cc"
+        "${LIBRARY_DIR}/array/array_nested.cc"
+        "${LIBRARY_DIR}/array/array_primitive.cc"
+        "${LIBRARY_DIR}/array/builder_adaptive.cc"
+        "${LIBRARY_DIR}/array/builder_base.cc"
+        "${LIBRARY_DIR}/array/builder_binary.cc"
+        "${LIBRARY_DIR}/array/builder_decimal.cc"
+        "${LIBRARY_DIR}/array/builder_dict.cc"
+        "${LIBRARY_DIR}/array/builder_nested.cc"
+        "${LIBRARY_DIR}/array/builder_primitive.cc"
+        "${LIBRARY_DIR}/array/builder_union.cc"
+        "${LIBRARY_DIR}/array/concatenate.cc"
+        "${LIBRARY_DIR}/array/data.cc"
+        "${LIBRARY_DIR}/array/diff.cc"
+        "${LIBRARY_DIR}/array/util.cc"
+        "${LIBRARY_DIR}/array/validate.cc"
 
-        ${LIBRARY_DIR}/compute/api_scalar.cc
-        ${LIBRARY_DIR}/compute/api_vector.cc
-        ${LIBRARY_DIR}/compute/cast.cc
-        ${LIBRARY_DIR}/compute/exec.cc
-        ${LIBRARY_DIR}/compute/function.cc
-        ${LIBRARY_DIR}/compute/kernel.cc
-        ${LIBRARY_DIR}/compute/registry.cc
+        "${LIBRARY_DIR}/compute/api_scalar.cc"
+        "${LIBRARY_DIR}/compute/api_vector.cc"
+        "${LIBRARY_DIR}/compute/cast.cc"
+        "${LIBRARY_DIR}/compute/exec.cc"
+        "${LIBRARY_DIR}/compute/function.cc"
+        "${LIBRARY_DIR}/compute/kernel.cc"
+        "${LIBRARY_DIR}/compute/registry.cc"
 
-        ${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc
-        ${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc
-        ${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc
-        ${LIBRARY_DIR}/compute/kernels/codegen_internal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_compare.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_fill_null.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_string.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_validity.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_hash.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_selection.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_sort.cc
-        ${LIBRARY_DIR}/compute/kernels/util_internal.cc
+        "${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc"
+        "${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc"
+        "${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc"
+        "${LIBRARY_DIR}/compute/kernels/codegen_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_compare.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_fill_null.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_string.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_validity.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_hash.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_sort.cc"
+        "${LIBRARY_DIR}/compute/kernels/util_internal.cc"
 
-        ${LIBRARY_DIR}/csv/chunker.cc
-        ${LIBRARY_DIR}/csv/column_builder.cc
-        ${LIBRARY_DIR}/csv/column_decoder.cc
-        ${LIBRARY_DIR}/csv/converter.cc
-        ${LIBRARY_DIR}/csv/options.cc
-        ${LIBRARY_DIR}/csv/parser.cc
-        ${LIBRARY_DIR}/csv/reader.cc
+        "${LIBRARY_DIR}/csv/chunker.cc"
+        "${LIBRARY_DIR}/csv/column_builder.cc"
+        "${LIBRARY_DIR}/csv/column_decoder.cc"
+        "${LIBRARY_DIR}/csv/converter.cc"
+        "${LIBRARY_DIR}/csv/options.cc"
+        "${LIBRARY_DIR}/csv/parser.cc"
+        "${LIBRARY_DIR}/csv/reader.cc"
 
-        ${LIBRARY_DIR}/ipc/dictionary.cc
-        ${LIBRARY_DIR}/ipc/feather.cc
-        ${LIBRARY_DIR}/ipc/message.cc
-        ${LIBRARY_DIR}/ipc/metadata_internal.cc
-        ${LIBRARY_DIR}/ipc/options.cc
-        ${LIBRARY_DIR}/ipc/reader.cc
-        ${LIBRARY_DIR}/ipc/writer.cc
+        "${LIBRARY_DIR}/ipc/dictionary.cc"
+        "${LIBRARY_DIR}/ipc/feather.cc"
+        "${LIBRARY_DIR}/ipc/message.cc"
+        "${LIBRARY_DIR}/ipc/metadata_internal.cc"
+        "${LIBRARY_DIR}/ipc/options.cc"
+        "${LIBRARY_DIR}/ipc/reader.cc"
+        "${LIBRARY_DIR}/ipc/writer.cc"
 
-        ${LIBRARY_DIR}/io/buffered.cc
-        ${LIBRARY_DIR}/io/caching.cc
-        ${LIBRARY_DIR}/io/compressed.cc
-        ${LIBRARY_DIR}/io/file.cc
-        ${LIBRARY_DIR}/io/interfaces.cc
-        ${LIBRARY_DIR}/io/memory.cc
-        ${LIBRARY_DIR}/io/slow.cc
+        "${LIBRARY_DIR}/io/buffered.cc"
+        "${LIBRARY_DIR}/io/caching.cc"
+        "${LIBRARY_DIR}/io/compressed.cc"
+        "${LIBRARY_DIR}/io/file.cc"
+        "${LIBRARY_DIR}/io/interfaces.cc"
+        "${LIBRARY_DIR}/io/memory.cc"
+        "${LIBRARY_DIR}/io/slow.cc"
 
-        ${LIBRARY_DIR}/tensor/coo_converter.cc
-        ${LIBRARY_DIR}/tensor/csf_converter.cc
-        ${LIBRARY_DIR}/tensor/csx_converter.cc
+        "${LIBRARY_DIR}/tensor/coo_converter.cc"
+        "${LIBRARY_DIR}/tensor/csf_converter.cc"
+        "${LIBRARY_DIR}/tensor/csx_converter.cc"
 
-        ${LIBRARY_DIR}/util/basic_decimal.cc
-        ${LIBRARY_DIR}/util/bit_block_counter.cc
-        ${LIBRARY_DIR}/util/bit_run_reader.cc
-        ${LIBRARY_DIR}/util/bit_util.cc
-        ${LIBRARY_DIR}/util/bitmap.cc
-        ${LIBRARY_DIR}/util/bitmap_builders.cc
-        ${LIBRARY_DIR}/util/bitmap_ops.cc
-        ${LIBRARY_DIR}/util/bpacking.cc
-        ${LIBRARY_DIR}/util/compression.cc
-        ${LIBRARY_DIR}/util/compression_lz4.cc
-        ${LIBRARY_DIR}/util/compression_snappy.cc
-        ${LIBRARY_DIR}/util/compression_zlib.cc
-        ${LIBRARY_DIR}/util/compression_zstd.cc
-        ${LIBRARY_DIR}/util/cpu_info.cc
-        ${LIBRARY_DIR}/util/decimal.cc
-        ${LIBRARY_DIR}/util/delimiting.cc
-        ${LIBRARY_DIR}/util/formatting.cc
-        ${LIBRARY_DIR}/util/future.cc
-        ${LIBRARY_DIR}/util/int_util.cc
-        ${LIBRARY_DIR}/util/io_util.cc
-        ${LIBRARY_DIR}/util/iterator.cc
-        ${LIBRARY_DIR}/util/key_value_metadata.cc
-        ${LIBRARY_DIR}/util/logging.cc
-        ${LIBRARY_DIR}/util/memory.cc
-        ${LIBRARY_DIR}/util/string_builder.cc
-        ${LIBRARY_DIR}/util/string.cc
-        ${LIBRARY_DIR}/util/task_group.cc
-        ${LIBRARY_DIR}/util/thread_pool.cc
-        ${LIBRARY_DIR}/util/time.cc
-        ${LIBRARY_DIR}/util/trie.cc
-        ${LIBRARY_DIR}/util/utf8.cc
-        ${LIBRARY_DIR}/util/value_parsing.cc
+        "${LIBRARY_DIR}/util/basic_decimal.cc"
+        "${LIBRARY_DIR}/util/bit_block_counter.cc"
+        "${LIBRARY_DIR}/util/bit_run_reader.cc"
+        "${LIBRARY_DIR}/util/bit_util.cc"
+        "${LIBRARY_DIR}/util/bitmap.cc"
+        "${LIBRARY_DIR}/util/bitmap_builders.cc"
+        "${LIBRARY_DIR}/util/bitmap_ops.cc"
+        "${LIBRARY_DIR}/util/bpacking.cc"
+        "${LIBRARY_DIR}/util/compression.cc"
+        "${LIBRARY_DIR}/util/compression_lz4.cc"
+        "${LIBRARY_DIR}/util/compression_snappy.cc"
+        "${LIBRARY_DIR}/util/compression_zlib.cc"
+        "${LIBRARY_DIR}/util/compression_zstd.cc"
+        "${LIBRARY_DIR}/util/cpu_info.cc"
+        "${LIBRARY_DIR}/util/decimal.cc"
+        "${LIBRARY_DIR}/util/delimiting.cc"
+        "${LIBRARY_DIR}/util/formatting.cc"
+        "${LIBRARY_DIR}/util/future.cc"
+        "${LIBRARY_DIR}/util/int_util.cc"
+        "${LIBRARY_DIR}/util/io_util.cc"
+        "${LIBRARY_DIR}/util/iterator.cc"
+        "${LIBRARY_DIR}/util/key_value_metadata.cc"
+        "${LIBRARY_DIR}/util/logging.cc"
+        "${LIBRARY_DIR}/util/memory.cc"
+        "${LIBRARY_DIR}/util/string_builder.cc"
+        "${LIBRARY_DIR}/util/string.cc"
+        "${LIBRARY_DIR}/util/task_group.cc"
+        "${LIBRARY_DIR}/util/thread_pool.cc"
+        "${LIBRARY_DIR}/util/time.cc"
+        "${LIBRARY_DIR}/util/trie.cc"
+        "${LIBRARY_DIR}/util/utf8.cc"
+        "${LIBRARY_DIR}/util/value_parsing.cc"
 
-        ${LIBRARY_DIR}/vendored/base64.cpp
+        "${LIBRARY_DIR}/vendored/base64.cpp"
         ${ORC_SRCS}
         )
 
@@ -298,21 +298,21 @@ if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
 endif ()
 
 add_definitions(-DARROW_WITH_LZ4)
-SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_lz4.cc ${ARROW_SRCS})
+SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_lz4.cc" ${ARROW_SRCS})
 
 if (ARROW_WITH_SNAPPY)
     add_definitions(-DARROW_WITH_SNAPPY)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_snappy.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_snappy.cc" ${ARROW_SRCS})
 endif ()
 
 if (ARROW_WITH_ZLIB)
     add_definitions(-DARROW_WITH_ZLIB)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_zlib.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zlib.cc" ${ARROW_SRCS})
 endif ()
 
 if (ARROW_WITH_ZSTD)
     add_definitions(-DARROW_WITH_ZSTD)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_zstd.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
 endif ()
 
 
@@ -327,8 +327,8 @@ if (USE_INTERNAL_PROTOBUF_LIBRARY)
     add_dependencies(${ARROW_LIBRARY} protoc)
 endif ()
 
-target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src)
-target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/cpp/src)
+target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")
+target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cpp/src")
 target_link_libraries(${ARROW_LIBRARY} PRIVATE ${DOUBLE_CONVERSION_LIBRARIES} ${Protobuf_LIBRARY})
 target_link_libraries(${ARROW_LIBRARY} PRIVATE lz4)
 if (ARROW_WITH_SNAPPY)
@@ -354,46 +354,46 @@ target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${FLATBUFFERS_INCLUDE
 
 # === parquet
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/parquet)
-set(GEN_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/generated)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/parquet")
+set(GEN_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/generated")
 # arrow/cpp/src/parquet/CMakeLists.txt
 set(PARQUET_SRCS
-        ${LIBRARY_DIR}/arrow/path_internal.cc
-        ${LIBRARY_DIR}/arrow/reader.cc
-        ${LIBRARY_DIR}/arrow/reader_internal.cc
-        ${LIBRARY_DIR}/arrow/schema.cc
-        ${LIBRARY_DIR}/arrow/schema_internal.cc
-        ${LIBRARY_DIR}/arrow/writer.cc
-        ${LIBRARY_DIR}/bloom_filter.cc
-        ${LIBRARY_DIR}/column_reader.cc
-        ${LIBRARY_DIR}/column_scanner.cc
-        ${LIBRARY_DIR}/column_writer.cc
-        ${LIBRARY_DIR}/deprecated_io.cc
-        ${LIBRARY_DIR}/encoding.cc
-        ${LIBRARY_DIR}/encryption.cc
-        ${LIBRARY_DIR}/encryption_internal.cc
-        ${LIBRARY_DIR}/file_reader.cc
-        ${LIBRARY_DIR}/file_writer.cc
-        ${LIBRARY_DIR}/internal_file_decryptor.cc
-        ${LIBRARY_DIR}/internal_file_encryptor.cc
-        ${LIBRARY_DIR}/level_conversion.cc
-        ${LIBRARY_DIR}/level_comparison.cc
-        ${LIBRARY_DIR}/metadata.cc
-        ${LIBRARY_DIR}/murmur3.cc
-        ${LIBRARY_DIR}/platform.cc
-        ${LIBRARY_DIR}/printer.cc
-        ${LIBRARY_DIR}/properties.cc
-        ${LIBRARY_DIR}/schema.cc
-        ${LIBRARY_DIR}/statistics.cc
-        ${LIBRARY_DIR}/types.cc
+        "${LIBRARY_DIR}/arrow/path_internal.cc"
+        "${LIBRARY_DIR}/arrow/reader.cc"
+        "${LIBRARY_DIR}/arrow/reader_internal.cc"
+        "${LIBRARY_DIR}/arrow/schema.cc"
+        "${LIBRARY_DIR}/arrow/schema_internal.cc"
+        "${LIBRARY_DIR}/arrow/writer.cc"
+        "${LIBRARY_DIR}/bloom_filter.cc"
+        "${LIBRARY_DIR}/column_reader.cc"
+        "${LIBRARY_DIR}/column_scanner.cc"
+        "${LIBRARY_DIR}/column_writer.cc"
+        "${LIBRARY_DIR}/deprecated_io.cc"
+        "${LIBRARY_DIR}/encoding.cc"
+        "${LIBRARY_DIR}/encryption.cc"
+        "${LIBRARY_DIR}/encryption_internal.cc"
+        "${LIBRARY_DIR}/file_reader.cc"
+        "${LIBRARY_DIR}/file_writer.cc"
+        "${LIBRARY_DIR}/internal_file_decryptor.cc"
+        "${LIBRARY_DIR}/internal_file_encryptor.cc"
+        "${LIBRARY_DIR}/level_conversion.cc"
+        "${LIBRARY_DIR}/level_comparison.cc"
+        "${LIBRARY_DIR}/metadata.cc"
+        "${LIBRARY_DIR}/murmur3.cc"
+        "${LIBRARY_DIR}/platform.cc"
+        "${LIBRARY_DIR}/printer.cc"
+        "${LIBRARY_DIR}/properties.cc"
+        "${LIBRARY_DIR}/schema.cc"
+        "${LIBRARY_DIR}/statistics.cc"
+        "${LIBRARY_DIR}/types.cc"
 
-        ${GEN_LIBRARY_DIR}/parquet_constants.cpp
-        ${GEN_LIBRARY_DIR}/parquet_types.cpp
+        "${GEN_LIBRARY_DIR}/parquet_constants.cpp"
+        "${GEN_LIBRARY_DIR}/parquet_types.cpp"
         )
-#list(TRANSFORM PARQUET_SRCS PREPEND ${LIBRARY_DIR}/) # cmake 3.12
+#list(TRANSFORM PARQUET_SRCS PREPEND "${LIBRARY_DIR}/") # cmake 3.12
 add_library(${PARQUET_LIBRARY} ${PARQUET_SRCS})
-target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src PRIVATE ${OPENSSL_INCLUDE_DIR})
-include(${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake) # makes config.h
+target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src" "${CMAKE_CURRENT_SOURCE_DIR}/cpp/src" PRIVATE ${OPENSSL_INCLUDE_DIR})
+include("${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake") # makes config.h
 target_link_libraries(${PARQUET_LIBRARY} PUBLIC ${ARROW_LIBRARY} PRIVATE ${THRIFT_LIBRARY} boost::headers_only boost::regex ${OPENSSL_LIBRARIES})
 
 if (SANITIZE STREQUAL "undefined")
@@ -403,9 +403,9 @@ endif ()
 
 # === tools
 
-set(TOOLS_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet)
+set(TOOLS_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet")
 set(PARQUET_TOOLS parquet_dump_schema parquet_reader parquet_scan)
 foreach (TOOL ${PARQUET_TOOLS})
-    add_executable(${TOOL} ${TOOLS_DIR}/${TOOL}.cc)
+    add_executable(${TOOL} "${TOOLS_DIR}/${TOOL}.cc")
     target_link_libraries(${TOOL} PRIVATE ${PARQUET_LIBRARY})
 endforeach ()

contrib/avro-cmake/CMakeLists.txt

@@ -1,10 +1,10 @@
-set(AVROCPP_ROOT_DIR ${CMAKE_SOURCE_DIR}/contrib/avro/lang/c++)
-set(AVROCPP_INCLUDE_DIR ${AVROCPP_ROOT_DIR}/api)
-set(AVROCPP_SOURCE_DIR ${AVROCPP_ROOT_DIR}/impl)
+set(AVROCPP_ROOT_DIR "${CMAKE_SOURCE_DIR}/contrib/avro/lang/c++")
+set(AVROCPP_INCLUDE_DIR "${AVROCPP_ROOT_DIR}/api")
+set(AVROCPP_SOURCE_DIR "${AVROCPP_ROOT_DIR}/impl")
 
 set (CMAKE_CXX_STANDARD 17)
 
-if (EXISTS ${AVROCPP_ROOT_DIR}/../../share/VERSION.txt)
+if (EXISTS "${AVROCPP_ROOT_DIR}/../../share/VERSION.txt")
     file(READ "${AVROCPP_ROOT_DIR}/../../share/VERSION.txt"
         AVRO_VERSION)
 endif()
@@ -14,30 +14,30 @@ set (AVRO_VERSION_MAJOR ${AVRO_VERSION})
 set (AVRO_VERSION_MINOR "0")
 
 set (AVROCPP_SOURCE_FILES
-    ${AVROCPP_SOURCE_DIR}/Compiler.cc
-    ${AVROCPP_SOURCE_DIR}/Node.cc
-    ${AVROCPP_SOURCE_DIR}/LogicalType.cc
-    ${AVROCPP_SOURCE_DIR}/NodeImpl.cc
-    ${AVROCPP_SOURCE_DIR}/ResolverSchema.cc
-    ${AVROCPP_SOURCE_DIR}/Schema.cc
-    ${AVROCPP_SOURCE_DIR}/Types.cc
-    ${AVROCPP_SOURCE_DIR}/ValidSchema.cc
-    ${AVROCPP_SOURCE_DIR}/Zigzag.cc
-    ${AVROCPP_SOURCE_DIR}/BinaryEncoder.cc
-    ${AVROCPP_SOURCE_DIR}/BinaryDecoder.cc
-    ${AVROCPP_SOURCE_DIR}/Stream.cc
-    ${AVROCPP_SOURCE_DIR}/FileStream.cc
-    ${AVROCPP_SOURCE_DIR}/Generic.cc
-    ${AVROCPP_SOURCE_DIR}/GenericDatum.cc
-    ${AVROCPP_SOURCE_DIR}/DataFile.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/Symbol.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/ValidatingCodec.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/JsonCodec.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/ResolvingDecoder.cc
-    ${AVROCPP_SOURCE_DIR}/json/JsonIO.cc
-    ${AVROCPP_SOURCE_DIR}/json/JsonDom.cc
-    ${AVROCPP_SOURCE_DIR}/Resolver.cc
-    ${AVROCPP_SOURCE_DIR}/Validator.cc
+    "${AVROCPP_SOURCE_DIR}/Compiler.cc"
+    "${AVROCPP_SOURCE_DIR}/Node.cc"
+    "${AVROCPP_SOURCE_DIR}/LogicalType.cc"
+    "${AVROCPP_SOURCE_DIR}/NodeImpl.cc"
+    "${AVROCPP_SOURCE_DIR}/ResolverSchema.cc"
+    "${AVROCPP_SOURCE_DIR}/Schema.cc"
+    "${AVROCPP_SOURCE_DIR}/Types.cc"
+    "${AVROCPP_SOURCE_DIR}/ValidSchema.cc"
+    "${AVROCPP_SOURCE_DIR}/Zigzag.cc"
+    "${AVROCPP_SOURCE_DIR}/BinaryEncoder.cc"
+    "${AVROCPP_SOURCE_DIR}/BinaryDecoder.cc"
+    "${AVROCPP_SOURCE_DIR}/Stream.cc"
+    "${AVROCPP_SOURCE_DIR}/FileStream.cc"
+    "${AVROCPP_SOURCE_DIR}/Generic.cc"
+    "${AVROCPP_SOURCE_DIR}/GenericDatum.cc"
+    "${AVROCPP_SOURCE_DIR}/DataFile.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/Symbol.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/ValidatingCodec.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/JsonCodec.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/ResolvingDecoder.cc"
+    "${AVROCPP_SOURCE_DIR}/json/JsonIO.cc"
+    "${AVROCPP_SOURCE_DIR}/json/JsonDom.cc"
+    "${AVROCPP_SOURCE_DIR}/Resolver.cc"
+    "${AVROCPP_SOURCE_DIR}/Validator.cc"
     )
 
 add_library (avrocpp ${AVROCPP_SOURCE_FILES})
@@ -63,7 +63,7 @@ target_compile_options(avrocpp PRIVATE ${SUPPRESS_WARNINGS})
 
 # create a symlink to include headers with <avro/...>
 ADD_CUSTOM_TARGET(avro_symlink_headers ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${AVROCPP_ROOT_DIR}/include
-    COMMAND ${CMAKE_COMMAND} -E create_symlink ${AVROCPP_ROOT_DIR}/api ${AVROCPP_ROOT_DIR}/include/avro
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${AVROCPP_ROOT_DIR}/include"
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${AVROCPP_ROOT_DIR}/api" "${AVROCPP_ROOT_DIR}/include/avro"
 )
 add_dependencies(avrocpp avro_symlink_headers)

contrib/aws-s3-cmake/CMakeLists.txt

@@ -1,8 +1,8 @@
-SET(AWS_S3_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3)
-SET(AWS_CORE_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core)
-SET(AWS_CHECKSUMS_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-checksums)
-SET(AWS_COMMON_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-c-common)
-SET(AWS_EVENT_STREAM_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-c-event-stream)
+SET(AWS_S3_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3")
+SET(AWS_CORE_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core")
+SET(AWS_CHECKSUMS_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-checksums")
+SET(AWS_COMMON_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-common")
+SET(AWS_EVENT_STREAM_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-event-stream")
 
 OPTION(USE_AWS_MEMORY_MANAGEMENT "Aws memory management" OFF)
 configure_file("${AWS_CORE_LIBRARY_DIR}/include/aws/core/SDKConfig.h.in"

contrib/base64-cmake/CMakeLists.txt

@@ -1,11 +1,11 @@
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/base64)
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
 
-add_library(base64_scalar OBJECT ${LIBRARY_DIR}/turbob64c.c ${LIBRARY_DIR}/turbob64d.c)
-add_library(base64_ssse3 OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This file also contains code for ARM NEON
+add_library(base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
+add_library(base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON
 
 if (ARCH_AMD64)
-    add_library(base64_avx OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This is not a mistake. One file is compiled twice.
-    add_library(base64_avx2 OBJECT ${LIBRARY_DIR}/turbob64avx2.c)
+    add_library(base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
+    add_library(base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
 endif ()
 
 target_compile_options(base64_scalar PRIVATE -falign-loops)

contrib/boost

@@ -1 +1 @@
-Subproject commit a8d43d3142cc6b26fc55bec33f7f6edb1156ab7a
+Subproject commit 1ccbb5a522a571ce83b606dbc2e1011c42ecccfb

contrib/boost-cmake/CMakeLists.txt

@@ -56,19 +56,19 @@ endif()
 
 if (NOT EXTERNAL_BOOST_FOUND)
     set (USE_INTERNAL_BOOST_LIBRARY 1)
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
+    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/boost")
 
     # filesystem
 
     set (SRCS_FILESYSTEM
-        ${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/operations.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/path.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/portability.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp
+        "${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/operations.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/path.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/portability.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp"
     )
 
     add_library (_boost_filesystem ${SRCS_FILESYSTEM})
@@ -88,10 +88,10 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # iostreams
 
     set (SRCS_IOSTREAMS
-        ${LIBRARY_DIR}/libs/iostreams/src/file_descriptor.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp
+        "${LIBRARY_DIR}/libs/iostreams/src/file_descriptor.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp"
     )
 
     add_library (_boost_iostreams ${SRCS_IOSTREAMS})
@@ -102,17 +102,17 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # program_options
 
     set (SRCS_PROGRAM_OPTIONS
-        ${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/config_file.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/convert.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/options_description.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/parsers.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/split.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/winmain.cpp
+        "${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/config_file.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/convert.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/options_description.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/parsers.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/split.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/winmain.cpp"
     )
 
     add_library (_boost_program_options ${SRCS_PROGRAM_OPTIONS})
@@ -122,24 +122,24 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # regex
 
     set (SRCS_REGEX
-        ${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cregex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/fileiter.cpp
-        ${LIBRARY_DIR}/libs/regex/src/icu.cpp
-        ${LIBRARY_DIR}/libs/regex/src/instances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/internals.hpp
-        ${LIBRARY_DIR}/libs/regex/src/posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/usinstances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/winstances.cpp
+        "${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/cregex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/fileiter.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/icu.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/instances.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/internals.hpp"
+        "${LIBRARY_DIR}/libs/regex/src/posix_api.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/usinstances.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/winstances.cpp"
     )
 
     add_library (_boost_regex ${SRCS_REGEX})
@@ -149,7 +149,7 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # system
 
     set (SRCS_SYSTEM
-        ${LIBRARY_DIR}/libs/system/src/error_code.cpp
+        "${LIBRARY_DIR}/libs/system/src/error_code.cpp"
     )
 
     add_library (_boost_system ${SRCS_SYSTEM})
@@ -161,9 +161,9 @@ if (NOT EXTERNAL_BOOST_FOUND)
     SET(ASM_OPTIONS "-x assembler-with-cpp")
 
     set (SRCS_CONTEXT
-        ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-        ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-        ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
+        "${LIBRARY_DIR}/libs/context/src/dummy.cpp"
+        "${LIBRARY_DIR}/libs/context/src/execution_context.cpp"
+        "${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp"
     )
 
     if (SANITIZE AND (SANITIZE STREQUAL "address" OR SANITIZE STREQUAL "thread"))
@@ -176,33 +176,33 @@ if (NOT EXTERNAL_BOOST_FOUND)
         endif()
 
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-                ${LIBRARY_DIR}/libs/context/src/fiber.cpp
-                ${LIBRARY_DIR}/libs/context/src/continuation.cpp
+                "${LIBRARY_DIR}/libs/context/src/fiber.cpp"
+                "${LIBRARY_DIR}/libs/context/src/continuation.cpp"
         )
     endif()
     if (ARCH_ARM)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S"
         )
     elseif (ARCH_PPC64LE)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S"
         )
     elseif(OS_DARWIN)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S"
         )
     else()
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S"
         )
     endif()
 
@@ -213,9 +213,9 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # coroutine
 
     set (SRCS_COROUTINE
-      ${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp
-      ${LIBRARY_DIR}/libs/coroutine/exceptions.cpp
-      ${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp
+      "${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp"
+      "${LIBRARY_DIR}/libs/coroutine/exceptions.cpp"
+      "${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp"
     )
     add_library (_boost_coroutine ${SRCS_COROUTINE})
     add_library (boost::coroutine ALIAS _boost_coroutine)

contrib/boringssl

@@ -1 +1 @@
-Subproject commit 83c1cda8a0224dc817cbad2966c7ed4acc35f02a
+Subproject commit a6a2e2ab3e44d97ce98e51c558e989f211de7eb3

contrib/boringssl-cmake/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 
 project(BoringSSL LANGUAGES C CXX)
 
-set(BORINGSSL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/boringssl)
+set(BORINGSSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/boringssl")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CLANG 1)
@@ -130,7 +130,7 @@ if(BUILD_SHARED_LIBS)
   set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 endif()
 
-include_directories(${BORINGSSL_SOURCE_DIR}/include)
+include_directories("${BORINGSSL_SOURCE_DIR}/include")
 
 set(
   CRYPTO_ios_aarch64_SOURCES
@@ -192,8 +192,8 @@ set(
   linux-arm/crypto/fipsmodule/sha512-armv4.S
   linux-arm/crypto/fipsmodule/vpaes-armv7.S
   linux-arm/crypto/test/trampoline-armv4.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/asm/x25519-asm-arm.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm_asm.S
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/asm/x25519-asm-arm.S"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm_asm.S"
 )
 
 set(
@@ -244,7 +244,7 @@ set(
   linux-x86_64/crypto/fipsmodule/x86_64-mont.S
   linux-x86_64/crypto/fipsmodule/x86_64-mont5.S
   linux-x86_64/crypto/test/trampoline-x86_64.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S
+  "${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S"
 )
 
 set(
@@ -348,300 +348,300 @@ add_library(
 
   ${CRYPTO_ARCH_SOURCES}
   err_data.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bitstr.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bool.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_d2i_fp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_dup.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_gentm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_i2d_fp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_mbstr.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_object.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_octet.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_print.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strnid.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utctm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utf8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_par.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn_pack.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_string.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_dec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_enc.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_fre.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_new.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_typ.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_utl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/time_support.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/base64/base64.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/bio.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/bio_mem.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/connect.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/fd.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/file.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/hexdump.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/pair.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/printf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/socket.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/socket_helper.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/bn_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/asn1_compat.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/ber.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbb.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbs.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/unicode.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/chacha/chacha.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/cipher_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/derive_key.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesccm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesctrhmac.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesgcmsiv.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_chacha20poly1305.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_null.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc4.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_tls.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/tls_cbc.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cmac/cmac.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/conf/conf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-fuchsia.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-linux.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm-linux.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/crypto.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/err/err.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/digestsign.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_ctx.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_dsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/pbkdf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/print.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/scrypt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/sign.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ex_data.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/bcm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/fips_shared_support.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/is_fips.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/hkdf/hkdf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/hpke/hpke.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/hrss/hrss.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/mem.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/obj/obj.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/obj/obj_xref.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_all.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_oth.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pk8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_xaux.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/p5_pbev2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_vec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pool/pool.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/refcount_c11.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/refcount_lock.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_print.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/siphash/siphash.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/stack/stack.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/trust_token/voprf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/a_digest.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/a_sign.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/a_strex.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/a_verify.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/algorithm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/asn1_gen.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/by_dir.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/by_file.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/i2d_pr.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/rsa_pss.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509a.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_att.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_cmp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_d2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_def.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_ext.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_lu.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_obj.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_r2x.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_req.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_set.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_trs.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_txt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_v3.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vfy.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vpm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509cset.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509name.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509rset.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509spki.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_algor.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_all.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_attrib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_crl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_exten.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_name.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pubkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_req.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_sig.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_spki.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_val.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509a.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_cache.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_data.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_map.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_node.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_tree.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akeya.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_alt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bcons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bitst.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_conf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_cpols.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_crld.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_extku.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_genn.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ia5.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ncons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ocsp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bitstr.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bool.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_d2i_fp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_dup.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_gentm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_i2d_fp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_mbstr.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_object.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_octet.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strnid.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utctm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utf8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_par.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn_pack.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_string.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_dec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_enc.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_fre.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_new.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_typ.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_utl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/time_support.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/base64/base64.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/bio.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/bio_mem.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/connect.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/fd.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/file.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/hexdump.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/pair.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/printf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket_helper.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/bn_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/asn1_compat.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/ber.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbb.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbs.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/unicode.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/chacha/chacha.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/cipher_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/derive_key.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesccm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesctrhmac.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesgcmsiv.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_chacha20poly1305.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_null.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc4.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_tls.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/tls_cbc.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cmac/cmac.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/conf/conf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-fuchsia.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-linux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm-linux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/crypto.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/err/err.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/digestsign.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_ctx.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_dsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/pbkdf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/scrypt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/sign.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ex_data.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/bcm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/fips_shared_support.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/is_fips.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/hkdf/hkdf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/hpke/hpke.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/hrss/hrss.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/mem.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/obj/obj.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/obj/obj_xref.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_all.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_oth.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pk8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_xaux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/p5_pbev2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_vec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pool/pool.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/refcount_c11.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/refcount_lock.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/siphash/siphash.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/stack/stack.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/voprf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_digest.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_sign.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_strex.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_verify.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/algorithm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/asn1_gen.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_dir.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_file.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/i2d_pr.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/rsa_pss.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509a.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_att.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_cmp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_d2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_def.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_ext.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_lu.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_obj.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_r2x.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_req.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_set.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_trs.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_txt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_v3.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vfy.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vpm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509cset.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509name.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509rset.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509spki.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_algor.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_all.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_attrib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_crl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_exten.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_name.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pubkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_req.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_sig.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_spki.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_val.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509a.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_cache.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_data.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_map.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_node.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_tree.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akeya.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_alt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bcons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bitst.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_conf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_cpols.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_crld.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_extku.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_genn.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ia5.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ncons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ocsp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c"
 )
 
 add_library(
   ssl
 
-  ${BORINGSSL_SOURCE_DIR}/ssl/bio_ssl.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_both.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_pkt.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_srtp.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/dtls_method.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/dtls_record.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handoff.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake_server.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_both.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_pkt.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_aead_ctx.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_asn1.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_buffer.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_cert.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_cipher.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_file.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_key_share.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_privkey.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_session.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_stat.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_transcript.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_versions.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_x509.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/t1_enc.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/t1_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls13_both.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls13_client.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls13_enc.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls13_server.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls_method.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls_record.cc
+  "${BORINGSSL_SOURCE_DIR}/ssl/bio_ssl.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_both.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_pkt.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_srtp.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/dtls_method.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/dtls_record.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handoff.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake_server.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_both.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_pkt.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_aead_ctx.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_asn1.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_buffer.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_cert.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_cipher.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_file.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_key_share.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_privkey.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_session.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_stat.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_transcript.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_versions.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_x509.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/t1_enc.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/t1_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_both.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_client.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_enc.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_server.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls_method.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls_record.cc"
 
-  ${BORINGSSL_SOURCE_DIR}/decrepit/ssl/ssl_decrepit.c
-  ${BORINGSSL_SOURCE_DIR}/decrepit/cfb/cfb.c
+  "${BORINGSSL_SOURCE_DIR}/decrepit/ssl/ssl_decrepit.c"
+  "${BORINGSSL_SOURCE_DIR}/decrepit/cfb/cfb.c"
 )
 
 add_executable(
   bssl
 
-  ${BORINGSSL_SOURCE_DIR}/tool/args.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/ciphers.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/client.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/const.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/digest.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/fd.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/file.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/rand.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/server.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/sign.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/speed.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/tool.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/transport_common.cc
+  "${BORINGSSL_SOURCE_DIR}/tool/args.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/ciphers.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/client.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/const.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/digest.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/fd.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/file.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/rand.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/server.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/sign.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/speed.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/tool.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/transport_common.cc"
 )
 
 target_link_libraries(ssl crypto)
@@ -655,7 +655,7 @@ if(WIN32)
   target_link_libraries(bssl ws2_32)
 endif()
 
-target_include_directories(crypto SYSTEM PUBLIC ${BORINGSSL_SOURCE_DIR}/include)
-target_include_directories(ssl SYSTEM PUBLIC ${BORINGSSL_SOURCE_DIR}/include)
+target_include_directories(crypto SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
+target_include_directories(ssl SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
 
 target_compile_options(crypto PRIVATE -Wno-gnu-anonymous-struct)

contrib/brotli-cmake/CMakeLists.txt

@@ -1,41 +1,41 @@
-set(BROTLI_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/brotli/c)
-set(BROTLI_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/brotli/c)
+set(BROTLI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/brotli/c")
+set(BROTLI_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/brotli/c")
 
 set(SRCS
-    ${BROTLI_SOURCE_DIR}/enc/command.c
-    ${BROTLI_SOURCE_DIR}/enc/fast_log.c
-    ${BROTLI_SOURCE_DIR}/dec/bit_reader.c
-    ${BROTLI_SOURCE_DIR}/dec/state.c
-    ${BROTLI_SOURCE_DIR}/dec/huffman.c
-    ${BROTLI_SOURCE_DIR}/dec/decode.c
-    ${BROTLI_SOURCE_DIR}/enc/encode.c
-    ${BROTLI_SOURCE_DIR}/enc/dictionary_hash.c
-    ${BROTLI_SOURCE_DIR}/enc/cluster.c
-    ${BROTLI_SOURCE_DIR}/enc/entropy_encode.c
-    ${BROTLI_SOURCE_DIR}/enc/literal_cost.c
-    ${BROTLI_SOURCE_DIR}/enc/compress_fragment_two_pass.c
-    ${BROTLI_SOURCE_DIR}/enc/static_dict.c
-    ${BROTLI_SOURCE_DIR}/enc/compress_fragment.c
-    ${BROTLI_SOURCE_DIR}/enc/block_splitter.c
-    ${BROTLI_SOURCE_DIR}/enc/backward_references_hq.c
-    ${BROTLI_SOURCE_DIR}/enc/histogram.c
-    ${BROTLI_SOURCE_DIR}/enc/brotli_bit_stream.c
-    ${BROTLI_SOURCE_DIR}/enc/utf8_util.c
-    ${BROTLI_SOURCE_DIR}/enc/encoder_dict.c
-    ${BROTLI_SOURCE_DIR}/enc/backward_references.c
-    ${BROTLI_SOURCE_DIR}/enc/bit_cost.c
-    ${BROTLI_SOURCE_DIR}/enc/metablock.c
-    ${BROTLI_SOURCE_DIR}/enc/memory.c
-    ${BROTLI_SOURCE_DIR}/common/dictionary.c
-    ${BROTLI_SOURCE_DIR}/common/transform.c
-    ${BROTLI_SOURCE_DIR}/common/platform.c
-    ${BROTLI_SOURCE_DIR}/common/context.c
-    ${BROTLI_SOURCE_DIR}/common/constants.c
+    "${BROTLI_SOURCE_DIR}/enc/command.c"
+    "${BROTLI_SOURCE_DIR}/enc/fast_log.c"
+    "${BROTLI_SOURCE_DIR}/dec/bit_reader.c"
+    "${BROTLI_SOURCE_DIR}/dec/state.c"
+    "${BROTLI_SOURCE_DIR}/dec/huffman.c"
+    "${BROTLI_SOURCE_DIR}/dec/decode.c"
+    "${BROTLI_SOURCE_DIR}/enc/encode.c"
+    "${BROTLI_SOURCE_DIR}/enc/dictionary_hash.c"
+    "${BROTLI_SOURCE_DIR}/enc/cluster.c"
+    "${BROTLI_SOURCE_DIR}/enc/entropy_encode.c"
+    "${BROTLI_SOURCE_DIR}/enc/literal_cost.c"
+    "${BROTLI_SOURCE_DIR}/enc/compress_fragment_two_pass.c"
+    "${BROTLI_SOURCE_DIR}/enc/static_dict.c"
+    "${BROTLI_SOURCE_DIR}/enc/compress_fragment.c"
+    "${BROTLI_SOURCE_DIR}/enc/block_splitter.c"
+    "${BROTLI_SOURCE_DIR}/enc/backward_references_hq.c"
+    "${BROTLI_SOURCE_DIR}/enc/histogram.c"
+    "${BROTLI_SOURCE_DIR}/enc/brotli_bit_stream.c"
+    "${BROTLI_SOURCE_DIR}/enc/utf8_util.c"
+    "${BROTLI_SOURCE_DIR}/enc/encoder_dict.c"
+    "${BROTLI_SOURCE_DIR}/enc/backward_references.c"
+    "${BROTLI_SOURCE_DIR}/enc/bit_cost.c"
+    "${BROTLI_SOURCE_DIR}/enc/metablock.c"
+    "${BROTLI_SOURCE_DIR}/enc/memory.c"
+    "${BROTLI_SOURCE_DIR}/common/dictionary.c"
+    "${BROTLI_SOURCE_DIR}/common/transform.c"
+    "${BROTLI_SOURCE_DIR}/common/platform.c"
+    "${BROTLI_SOURCE_DIR}/common/context.c"
+    "${BROTLI_SOURCE_DIR}/common/constants.c"
 )
 
 add_library(brotli ${SRCS})
 
-target_include_directories(brotli PUBLIC ${BROTLI_SOURCE_DIR}/include)
+target_include_directories(brotli PUBLIC "${BROTLI_SOURCE_DIR}/include")
 
 if(M_LIBRARY)
     target_link_libraries(brotli PRIVATE ${M_LIBRARY})

contrib/capnproto-cmake/CMakeLists.txt

@@ -1,53 +1,53 @@
-set (CAPNPROTO_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src)
+set (CAPNPROTO_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src")
 
 set (CMAKE_CXX_STANDARD 17)
 
 set (KJ_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/kj/array.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/common.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/debug.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/exception.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/io.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/memory.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/mutex.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/string.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/hash.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/table.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/thread.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/main.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/arena.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/test-helpers.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/units.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/encoding.c++
+    "${CAPNPROTO_SOURCE_DIR}/kj/array.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/common.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/debug.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/exception.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/io.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/memory.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/mutex.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/string.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/hash.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/table.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/thread.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/main.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/arena.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/test-helpers.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/units.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/encoding.c++"
 
-    ${CAPNPROTO_SOURCE_DIR}/kj/refcount.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/string-tree.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/time.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-unix.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-win32.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/parse/char.c++
+    "${CAPNPROTO_SOURCE_DIR}/kj/refcount.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/string-tree.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/time.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-unix.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-win32.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/parse/char.c++"
 )
 
 add_library(kj ${KJ_SRCS})
 target_include_directories(kj SYSTEM PUBLIC ${CAPNPROTO_SOURCE_DIR})
 
 set (CAPNP_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/capnp/c++.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/blob.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/arena.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/layout.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/list.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/any.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/message.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize-packed.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/c++.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/blob.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/arena.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/layout.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/list.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/any.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/message.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-packed.c++"
 
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema-loader.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/dynamic.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema-loader.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/dynamic.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++"
 )
 
 add_library(capnp ${CAPNP_SRCS})
@@ -57,16 +57,16 @@ set_target_properties(capnp
 target_link_libraries(capnp PUBLIC kj)
 
 set (CAPNPC_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/type-id.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/error-reporter.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/grammar.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/parser.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/node-translator.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/compiler.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema-parser.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize-text.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/type-id.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/error-reporter.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/grammar.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/parser.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/node-translator.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/compiler.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema-parser.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-text.c++"
 )
 
 add_library(capnpc ${CAPNPC_SRCS})

contrib/cctz-cmake/CMakeLists.txt

@@ -40,23 +40,23 @@ 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(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
-        ${LIBRARY_DIR}/src/time_zone_if.cc
-        ${LIBRARY_DIR}/src/time_zone_impl.cc
-        ${LIBRARY_DIR}/src/time_zone_info.cc
-        ${LIBRARY_DIR}/src/time_zone_libc.cc
-        ${LIBRARY_DIR}/src/time_zone_lookup.cc
-        ${LIBRARY_DIR}/src/time_zone_posix.cc
-        ${LIBRARY_DIR}/src/zone_info_source.cc
+        "${LIBRARY_DIR}/src/civil_time_detail.cc"
+        "${LIBRARY_DIR}/src/time_zone_fixed.cc"
+        "${LIBRARY_DIR}/src/time_zone_format.cc"
+        "${LIBRARY_DIR}/src/time_zone_if.cc"
+        "${LIBRARY_DIR}/src/time_zone_impl.cc"
+        "${LIBRARY_DIR}/src/time_zone_info.cc"
+        "${LIBRARY_DIR}/src/time_zone_libc.cc"
+        "${LIBRARY_DIR}/src/time_zone_lookup.cc"
+        "${LIBRARY_DIR}/src/time_zone_posix.cc"
+        "${LIBRARY_DIR}/src/zone_info_source.cc"
     )
 
     add_library (cctz ${SRCS})
-    target_include_directories (cctz PUBLIC ${LIBRARY_DIR}/include)
+    target_include_directories (cctz PUBLIC "${LIBRARY_DIR}/include")
 
     if (OS_FREEBSD)
         # yes, need linux, because bsd check inside linux in time_zone_libc.cc:24
@@ -73,8 +73,8 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
     # Build a libray with embedded tzdata
     if (OS_LINUX)
         # get the list of timezones from tzdata shipped with cctz
-        set(TZDIR ${LIBRARY_DIR}/testdata/zoneinfo)
-        file(STRINGS ${LIBRARY_DIR}/testdata/version TZDATA_VERSION)
+        set(TZDIR "${LIBRARY_DIR}/testdata/zoneinfo")
+        file(STRINGS "${LIBRARY_DIR}/testdata/version" TZDATA_VERSION)
         set_property(GLOBAL PROPERTY TZDATA_VERSION_PROP "${TZDATA_VERSION}")
         message(STATUS "Packaging with tzdata version: ${TZDATA_VERSION}")
 
@@ -100,15 +100,15 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
             # PPC64LE fails to do this with objcopy, use ld or lld instead
             if (ARCH_PPC64LE)
                 add_custom_command(OUTPUT ${TZ_OBJ}
-                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cp "${TZDIR}/${TIMEZONE}" "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}"
                     COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o ${TZ_OBJ} ${TIMEZONE_ID}
-                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+                    COMMAND rm "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}")
             else()
                 add_custom_command(OUTPUT ${TZ_OBJ}
-                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cp "${TZDIR}/${TIMEZONE}" "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}"
                     COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS}
                             --rename-section .data=.rodata,alloc,load,readonly,data,contents ${TIMEZONE_ID} ${TZ_OBJ}
-                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+                    COMMAND rm "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}")
             endif()
             set_source_files_properties(${TZ_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
         endforeach(TIMEZONE)

contrib/cppkafka

@@ -1 +1 @@
-Subproject commit b06e64ef5bffd636d918a742c689f69130c1dbab
+Subproject commit 57a599d99c540e647bcd0eb9ea77c523cca011b3

contrib/cppkafka-cmake/CMakeLists.txt

@@ -1,25 +1,25 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cppkafka)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cppkafka")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/buffer.cpp
-    ${LIBRARY_DIR}/src/configuration_option.cpp
-    ${LIBRARY_DIR}/src/configuration.cpp
-    ${LIBRARY_DIR}/src/consumer.cpp
-    ${LIBRARY_DIR}/src/error.cpp
-    ${LIBRARY_DIR}/src/event.cpp
-    ${LIBRARY_DIR}/src/exceptions.cpp
-    ${LIBRARY_DIR}/src/group_information.cpp
-    ${LIBRARY_DIR}/src/kafka_handle_base.cpp
-    ${LIBRARY_DIR}/src/message_internal.cpp
-    ${LIBRARY_DIR}/src/message_timestamp.cpp
-    ${LIBRARY_DIR}/src/message.cpp
-    ${LIBRARY_DIR}/src/metadata.cpp
-    ${LIBRARY_DIR}/src/producer.cpp
-    ${LIBRARY_DIR}/src/queue.cpp
-    ${LIBRARY_DIR}/src/topic_configuration.cpp
-    ${LIBRARY_DIR}/src/topic_partition_list.cpp
-    ${LIBRARY_DIR}/src/topic_partition.cpp
-    ${LIBRARY_DIR}/src/topic.cpp
+    "${LIBRARY_DIR}/src/buffer.cpp"
+    "${LIBRARY_DIR}/src/configuration_option.cpp"
+    "${LIBRARY_DIR}/src/configuration.cpp"
+    "${LIBRARY_DIR}/src/consumer.cpp"
+    "${LIBRARY_DIR}/src/error.cpp"
+    "${LIBRARY_DIR}/src/event.cpp"
+    "${LIBRARY_DIR}/src/exceptions.cpp"
+    "${LIBRARY_DIR}/src/group_information.cpp"
+    "${LIBRARY_DIR}/src/kafka_handle_base.cpp"
+    "${LIBRARY_DIR}/src/message_internal.cpp"
+    "${LIBRARY_DIR}/src/message_timestamp.cpp"
+    "${LIBRARY_DIR}/src/message.cpp"
+    "${LIBRARY_DIR}/src/metadata.cpp"
+    "${LIBRARY_DIR}/src/producer.cpp"
+    "${LIBRARY_DIR}/src/queue.cpp"
+    "${LIBRARY_DIR}/src/topic_configuration.cpp"
+    "${LIBRARY_DIR}/src/topic_partition_list.cpp"
+    "${LIBRARY_DIR}/src/topic_partition.cpp"
+    "${LIBRARY_DIR}/src/topic.cpp"
 )
 
 add_library(cppkafka ${SRCS})
@@ -29,5 +29,5 @@ target_link_libraries(cppkafka
         ${RDKAFKA_LIBRARY}
         boost::headers_only
 )
-target_include_directories(cppkafka PRIVATE ${LIBRARY_DIR}/include/cppkafka)
-target_include_directories(cppkafka SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories(cppkafka PRIVATE "${LIBRARY_DIR}/include/cppkafka")
+target_include_directories(cppkafka SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")

contrib/croaring-cmake/CMakeLists.txt

@@ -1,26 +1,26 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/croaring)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/croaring")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/array_util.c
-    ${LIBRARY_DIR}/src/bitset_util.c
-    ${LIBRARY_DIR}/src/containers/array.c
-    ${LIBRARY_DIR}/src/containers/bitset.c
-    ${LIBRARY_DIR}/src/containers/containers.c
-    ${LIBRARY_DIR}/src/containers/convert.c
-    ${LIBRARY_DIR}/src/containers/mixed_intersection.c
-    ${LIBRARY_DIR}/src/containers/mixed_union.c
-    ${LIBRARY_DIR}/src/containers/mixed_equal.c
-    ${LIBRARY_DIR}/src/containers/mixed_subset.c
-    ${LIBRARY_DIR}/src/containers/mixed_negation.c
-    ${LIBRARY_DIR}/src/containers/mixed_xor.c
-    ${LIBRARY_DIR}/src/containers/mixed_andnot.c
-    ${LIBRARY_DIR}/src/containers/run.c
-    ${LIBRARY_DIR}/src/roaring.c
-    ${LIBRARY_DIR}/src/roaring_priority_queue.c
-    ${LIBRARY_DIR}/src/roaring_array.c)
+    "${LIBRARY_DIR}/src/array_util.c"
+    "${LIBRARY_DIR}/src/bitset_util.c"
+    "${LIBRARY_DIR}/src/containers/array.c"
+    "${LIBRARY_DIR}/src/containers/bitset.c"
+    "${LIBRARY_DIR}/src/containers/containers.c"
+    "${LIBRARY_DIR}/src/containers/convert.c"
+    "${LIBRARY_DIR}/src/containers/mixed_intersection.c"
+    "${LIBRARY_DIR}/src/containers/mixed_union.c"
+    "${LIBRARY_DIR}/src/containers/mixed_equal.c"
+    "${LIBRARY_DIR}/src/containers/mixed_subset.c"
+    "${LIBRARY_DIR}/src/containers/mixed_negation.c"
+    "${LIBRARY_DIR}/src/containers/mixed_xor.c"
+    "${LIBRARY_DIR}/src/containers/mixed_andnot.c"
+    "${LIBRARY_DIR}/src/containers/run.c"
+    "${LIBRARY_DIR}/src/roaring.c"
+    "${LIBRARY_DIR}/src/roaring_priority_queue.c"
+    "${LIBRARY_DIR}/src/roaring_array.c")
 
 add_library(roaring ${SRCS})
 
-target_include_directories(roaring PRIVATE ${LIBRARY_DIR}/include/roaring)
-target_include_directories(roaring SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
-target_include_directories(roaring SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/cpp)
+target_include_directories(roaring PRIVATE "${LIBRARY_DIR}/include/roaring")
+target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
+target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/cpp")

contrib/curl-cmake/CMakeLists.txt

@@ -5,143 +5,143 @@ endif()
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
 
 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
+    "${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})
@@ -154,8 +154,8 @@ target_compile_definitions (curl PRIVATE
     OS="${CMAKE_SYSTEM_NAME}"
 )
 target_include_directories (curl PUBLIC
-    ${LIBRARY_DIR}/include
-    ${LIBRARY_DIR}/lib
+    "${LIBRARY_DIR}/include"
+    "${LIBRARY_DIR}/lib"
     . # curl_config.h
 )
 
@@ -171,8 +171,8 @@ target_compile_options (curl PRIVATE -g0)
 # - 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_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 "")

contrib/cyrus-sasl

@@ -1 +1 @@
-Subproject commit 9995bf9d8e14f58934d9313ac64f13780d6dd3c9
+Subproject commit e6466edfd638cc5073debe941c53345b18a09512

contrib/cyrus-sasl-cmake/CMakeLists.txt

@@ -1,23 +1,23 @@
-set(CYRUS_SASL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl)
+set(CYRUS_SASL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl")
 
 add_library(${CYRUS_SASL_LIBRARY})
 
 target_sources(${CYRUS_SASL_LIBRARY} PRIVATE
-    ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c
-    # ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c
-    ${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/common.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/canonusr.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/server.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/config.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/auxprop.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/saslutil.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/external.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/seterror.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/md5.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/dlopen.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/client.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/checkpw.c
+    "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c"
+    # "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c"
+    "${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/common.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/canonusr.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/server.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/config.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/auxprop.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/saslutil.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/external.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/seterror.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/md5.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/dlopen.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/client.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/checkpw.c"
 )
 
 target_include_directories(${CYRUS_SASL_LIBRARY} PUBLIC
@@ -26,16 +26,16 @@ target_include_directories(${CYRUS_SASL_LIBRARY} PUBLIC
 
 target_include_directories(${CYRUS_SASL_LIBRARY} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}  # for config.h
-    ${CYRUS_SASL_SOURCE_DIR}/plugins
+    "${CYRUS_SASL_SOURCE_DIR}/plugins"
     ${CYRUS_SASL_SOURCE_DIR}
-    ${CYRUS_SASL_SOURCE_DIR}/include
-    ${CYRUS_SASL_SOURCE_DIR}/lib
-    ${CYRUS_SASL_SOURCE_DIR}/sasldb
-    ${CYRUS_SASL_SOURCE_DIR}/common
-    ${CYRUS_SASL_SOURCE_DIR}/saslauthd
-    ${CYRUS_SASL_SOURCE_DIR}/sample
-    ${CYRUS_SASL_SOURCE_DIR}/utils
-    ${CYRUS_SASL_SOURCE_DIR}/tests
+    "${CYRUS_SASL_SOURCE_DIR}/include"
+    "${CYRUS_SASL_SOURCE_DIR}/lib"
+    "${CYRUS_SASL_SOURCE_DIR}/sasldb"
+    "${CYRUS_SASL_SOURCE_DIR}/common"
+    "${CYRUS_SASL_SOURCE_DIR}/saslauthd"
+    "${CYRUS_SASL_SOURCE_DIR}/sample"
+    "${CYRUS_SASL_SOURCE_DIR}/utils"
+    "${CYRUS_SASL_SOURCE_DIR}/tests"
 )
 
 target_compile_definitions(${CYRUS_SASL_LIBRARY} PUBLIC
@@ -52,15 +52,15 @@ target_compile_definitions(${CYRUS_SASL_LIBRARY} PUBLIC
     LIBSASL_EXPORTS=1
 )
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/sasl)
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sasl")
 
 file(COPY
-    ${CYRUS_SASL_SOURCE_DIR}/include/sasl.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/sasl
+    "${CYRUS_SASL_SOURCE_DIR}/include/sasl.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sasl"
 )
 
 file(COPY
-    ${CYRUS_SASL_SOURCE_DIR}/include/prop.h
+    "${CYRUS_SASL_SOURCE_DIR}/include/prop.h"
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
 )
 

contrib/datasketches-cpp

@@ -1 +1 @@
-Subproject commit 45885c0c8c0807bb9480886d60ca7042000a4c43
+Subproject commit 7d73d7610db31d4e1ecde0fb3a7ee90ef371207f

contrib/double-conversion-cmake/CMakeLists.txt

@@ -1,13 +1,13 @@
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/double-conversion)
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion")
 
 add_library(double-conversion
-${LIBRARY_DIR}/double-conversion/bignum.cc
-${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc
-${LIBRARY_DIR}/double-conversion/cached-powers.cc
-${LIBRARY_DIR}/double-conversion/diy-fp.cc
-${LIBRARY_DIR}/double-conversion/double-conversion.cc
-${LIBRARY_DIR}/double-conversion/fast-dtoa.cc
-${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc
-${LIBRARY_DIR}/double-conversion/strtod.cc)
+"${LIBRARY_DIR}/double-conversion/bignum.cc"
+"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/cached-powers.cc"
+"${LIBRARY_DIR}/double-conversion/diy-fp.cc"
+"${LIBRARY_DIR}/double-conversion/double-conversion.cc"
+"${LIBRARY_DIR}/double-conversion/fast-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/strtod.cc")
 
 target_include_directories(double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}")

contrib/fastops-cmake/CMakeLists.txt

@@ -1,18 +1,18 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/fastops)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/fastops")
 
 set(SRCS "")
 
 if(HAVE_AVX)
-    set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/avx/ops_avx.cpp)
-    set_source_files_properties(${LIBRARY_DIR}/fastops/avx/ops_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx -DNO_AVX2")
+    set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx/ops_avx.cpp")
+    set_source_files_properties("${LIBRARY_DIR}/fastops/avx/ops_avx.cpp" PROPERTIES COMPILE_FLAGS "-mavx -DNO_AVX2")
 endif()
 
 if(HAVE_AVX2)
-    set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp)
-    set_source_files_properties(${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
+    set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp")
+    set_source_files_properties("${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp" PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
 endif()
 
-set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/plain/ops_plain.cpp ${LIBRARY_DIR}/fastops/core/avx_id.cpp ${LIBRARY_DIR}/fastops/fastops.cpp)
+set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/plain/ops_plain.cpp" "${LIBRARY_DIR}/fastops/core/avx_id.cpp" "${LIBRARY_DIR}/fastops/fastops.cpp")
 
 add_library(fastops ${SRCS})
 

contrib/grpc

@@ -1 +1 @@
-Subproject commit 8d558f03fe370240081424fafa76cdc9301ea14b
+Subproject commit 60c986e15cae70aade721d26badabab1f822fdd6

contrib/h3-cmake/CMakeLists.txt

@@ -1,30 +1,30 @@
-set(H3_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib)
-set(H3_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib)
+set(H3_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib")
+set(H3_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib")
 
 set(SRCS
-${H3_SOURCE_DIR}/lib/algos.c
-${H3_SOURCE_DIR}/lib/baseCells.c
-${H3_SOURCE_DIR}/lib/bbox.c
-${H3_SOURCE_DIR}/lib/coordijk.c
-${H3_SOURCE_DIR}/lib/faceijk.c
-${H3_SOURCE_DIR}/lib/geoCoord.c
-${H3_SOURCE_DIR}/lib/h3Index.c
-${H3_SOURCE_DIR}/lib/h3UniEdge.c
-${H3_SOURCE_DIR}/lib/linkedGeo.c
-${H3_SOURCE_DIR}/lib/localij.c
-${H3_SOURCE_DIR}/lib/mathExtensions.c
-${H3_SOURCE_DIR}/lib/polygon.c
-${H3_SOURCE_DIR}/lib/vec2d.c
-${H3_SOURCE_DIR}/lib/vec3d.c
-${H3_SOURCE_DIR}/lib/vertex.c
-${H3_SOURCE_DIR}/lib/vertexGraph.c
+"${H3_SOURCE_DIR}/lib/algos.c"
+"${H3_SOURCE_DIR}/lib/baseCells.c"
+"${H3_SOURCE_DIR}/lib/bbox.c"
+"${H3_SOURCE_DIR}/lib/coordijk.c"
+"${H3_SOURCE_DIR}/lib/faceijk.c"
+"${H3_SOURCE_DIR}/lib/geoCoord.c"
+"${H3_SOURCE_DIR}/lib/h3Index.c"
+"${H3_SOURCE_DIR}/lib/h3UniEdge.c"
+"${H3_SOURCE_DIR}/lib/linkedGeo.c"
+"${H3_SOURCE_DIR}/lib/localij.c"
+"${H3_SOURCE_DIR}/lib/mathExtensions.c"
+"${H3_SOURCE_DIR}/lib/polygon.c"
+"${H3_SOURCE_DIR}/lib/vec2d.c"
+"${H3_SOURCE_DIR}/lib/vec3d.c"
+"${H3_SOURCE_DIR}/lib/vertex.c"
+"${H3_SOURCE_DIR}/lib/vertexGraph.c"
 )
 
-configure_file(${H3_SOURCE_DIR}/include/h3api.h.in ${H3_BINARY_DIR}/include/h3api.h)
+configure_file("${H3_SOURCE_DIR}/include/h3api.h.in" "${H3_BINARY_DIR}/include/h3api.h")
 
 add_library(h3 ${SRCS})
-target_include_directories(h3 SYSTEM PUBLIC ${H3_SOURCE_DIR}/include)
-target_include_directories(h3 SYSTEM PUBLIC ${H3_BINARY_DIR}/include)
+target_include_directories(h3 SYSTEM PUBLIC "${H3_SOURCE_DIR}/include")
+target_include_directories(h3 SYSTEM PUBLIC "${H3_BINARY_DIR}/include")
 target_compile_definitions(h3 PRIVATE H3_HAVE_VLA)
 if(M_LIBRARY)
     target_link_libraries(h3 PRIVATE ${M_LIBRARY})

contrib/hyperscan-cmake/CMakeLists.txt

@@ -40,211 +40,211 @@ endif ()
 if (NOT EXTERNAL_HYPERSCAN_LIBRARY_FOUND)
     set (USE_INTERNAL_HYPERSCAN_LIBRARY 1)
 
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/hyperscan)
+    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
+        "${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})
@@ -259,9 +259,9 @@ if (NOT EXTERNAL_HYPERSCAN_LIBRARY_FOUND)
     target_include_directories (hyperscan
         PRIVATE
             common
-            ${LIBRARY_DIR}/include
+            "${LIBRARY_DIR}/include"
     )
-    target_include_directories (hyperscan SYSTEM PUBLIC ${LIBRARY_DIR}/src)
+    target_include_directories (hyperscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
     if (ARCH_AMD64)
         target_include_directories (hyperscan PRIVATE x86_64)
     endif ()

contrib/icu-cmake/CMakeLists.txt

@@ -1,447 +1,447 @@
-set(ICU_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source)
-set(ICUDATA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/icudata/)
+set(ICU_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source")
+set(ICUDATA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icudata/")
 
 set (CMAKE_CXX_STANDARD 17)
 
 # These lists of sources were generated from build log of the original ICU build system (configure + make).
 
 set(ICUUC_SOURCES
-${ICU_SOURCE_DIR}/common/errorcode.cpp
-${ICU_SOURCE_DIR}/common/putil.cpp
-${ICU_SOURCE_DIR}/common/umath.cpp
-${ICU_SOURCE_DIR}/common/utypes.cpp
-${ICU_SOURCE_DIR}/common/uinvchar.cpp
-${ICU_SOURCE_DIR}/common/umutex.cpp
-${ICU_SOURCE_DIR}/common/ucln_cmn.cpp
-${ICU_SOURCE_DIR}/common/uinit.cpp
-${ICU_SOURCE_DIR}/common/uobject.cpp
-${ICU_SOURCE_DIR}/common/cmemory.cpp
-${ICU_SOURCE_DIR}/common/charstr.cpp
-${ICU_SOURCE_DIR}/common/cstr.cpp
-${ICU_SOURCE_DIR}/common/udata.cpp
-${ICU_SOURCE_DIR}/common/ucmndata.cpp
-${ICU_SOURCE_DIR}/common/udatamem.cpp
-${ICU_SOURCE_DIR}/common/umapfile.cpp
-${ICU_SOURCE_DIR}/common/udataswp.cpp
-${ICU_SOURCE_DIR}/common/utrie_swap.cpp
-${ICU_SOURCE_DIR}/common/ucol_swp.cpp
-${ICU_SOURCE_DIR}/common/utrace.cpp
-${ICU_SOURCE_DIR}/common/uhash.cpp
-${ICU_SOURCE_DIR}/common/uhash_us.cpp
-${ICU_SOURCE_DIR}/common/uenum.cpp
-${ICU_SOURCE_DIR}/common/ustrenum.cpp
-${ICU_SOURCE_DIR}/common/uvector.cpp
-${ICU_SOURCE_DIR}/common/ustack.cpp
-${ICU_SOURCE_DIR}/common/uvectr32.cpp
-${ICU_SOURCE_DIR}/common/uvectr64.cpp
-${ICU_SOURCE_DIR}/common/ucnv.cpp
-${ICU_SOURCE_DIR}/common/ucnv_bld.cpp
-${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp
-${ICU_SOURCE_DIR}/common/ucnv_io.cpp
-${ICU_SOURCE_DIR}/common/ucnv_cb.cpp
-${ICU_SOURCE_DIR}/common/ucnv_err.cpp
-${ICU_SOURCE_DIR}/common/ucnvlat1.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u7.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u8.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u16.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u32.cpp
-${ICU_SOURCE_DIR}/common/ucnvscsu.cpp
-${ICU_SOURCE_DIR}/common/ucnvbocu.cpp
-${ICU_SOURCE_DIR}/common/ucnv_ext.cpp
-${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp
-${ICU_SOURCE_DIR}/common/ucnv2022.cpp
-${ICU_SOURCE_DIR}/common/ucnvhz.cpp
-${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp
-${ICU_SOURCE_DIR}/common/ucnvisci.cpp
-${ICU_SOURCE_DIR}/common/ucnvdisp.cpp
-${ICU_SOURCE_DIR}/common/ucnv_set.cpp
-${ICU_SOURCE_DIR}/common/ucnv_ct.cpp
-${ICU_SOURCE_DIR}/common/resource.cpp
-${ICU_SOURCE_DIR}/common/uresbund.cpp
-${ICU_SOURCE_DIR}/common/ures_cnv.cpp
-${ICU_SOURCE_DIR}/common/uresdata.cpp
-${ICU_SOURCE_DIR}/common/resbund.cpp
-${ICU_SOURCE_DIR}/common/resbund_cnv.cpp
-${ICU_SOURCE_DIR}/common/ucurr.cpp
-${ICU_SOURCE_DIR}/common/localebuilder.cpp
-${ICU_SOURCE_DIR}/common/localeprioritylist.cpp
-${ICU_SOURCE_DIR}/common/messagepattern.cpp
-${ICU_SOURCE_DIR}/common/ucat.cpp
-${ICU_SOURCE_DIR}/common/locmap.cpp
-${ICU_SOURCE_DIR}/common/uloc.cpp
-${ICU_SOURCE_DIR}/common/locid.cpp
-${ICU_SOURCE_DIR}/common/locutil.cpp
-${ICU_SOURCE_DIR}/common/locavailable.cpp
-${ICU_SOURCE_DIR}/common/locdispnames.cpp
-${ICU_SOURCE_DIR}/common/locdspnm.cpp
-${ICU_SOURCE_DIR}/common/loclikely.cpp
-${ICU_SOURCE_DIR}/common/locresdata.cpp
-${ICU_SOURCE_DIR}/common/lsr.cpp
-${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp
-${ICU_SOURCE_DIR}/common/locdistance.cpp
-${ICU_SOURCE_DIR}/common/localematcher.cpp
-${ICU_SOURCE_DIR}/common/bytestream.cpp
-${ICU_SOURCE_DIR}/common/stringpiece.cpp
-${ICU_SOURCE_DIR}/common/bytesinkutil.cpp
-${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp
-${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp
-${ICU_SOURCE_DIR}/common/bytestrie.cpp
-${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp
-${ICU_SOURCE_DIR}/common/ucharstrie.cpp
-${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp
-${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp
-${ICU_SOURCE_DIR}/common/dictionarydata.cpp
-${ICU_SOURCE_DIR}/common/edits.cpp
-${ICU_SOURCE_DIR}/common/appendable.cpp
-${ICU_SOURCE_DIR}/common/ustr_cnv.cpp
-${ICU_SOURCE_DIR}/common/unistr_cnv.cpp
-${ICU_SOURCE_DIR}/common/unistr.cpp
-${ICU_SOURCE_DIR}/common/unistr_case.cpp
-${ICU_SOURCE_DIR}/common/unistr_props.cpp
-${ICU_SOURCE_DIR}/common/utf_impl.cpp
-${ICU_SOURCE_DIR}/common/ustring.cpp
-${ICU_SOURCE_DIR}/common/ustrcase.cpp
-${ICU_SOURCE_DIR}/common/ucasemap.cpp
-${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/cstring.cpp
-${ICU_SOURCE_DIR}/common/ustrfmt.cpp
-${ICU_SOURCE_DIR}/common/ustrtrns.cpp
-${ICU_SOURCE_DIR}/common/ustr_wcs.cpp
-${ICU_SOURCE_DIR}/common/utext.cpp
-${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp
-${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp
-${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/normalizer2impl.cpp
-${ICU_SOURCE_DIR}/common/normalizer2.cpp
-${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp
-${ICU_SOURCE_DIR}/common/normlzr.cpp
-${ICU_SOURCE_DIR}/common/unorm.cpp
-${ICU_SOURCE_DIR}/common/unormcmp.cpp
-${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp
-${ICU_SOURCE_DIR}/common/chariter.cpp
-${ICU_SOURCE_DIR}/common/schriter.cpp
-${ICU_SOURCE_DIR}/common/uchriter.cpp
-${ICU_SOURCE_DIR}/common/uiter.cpp
-${ICU_SOURCE_DIR}/common/patternprops.cpp
-${ICU_SOURCE_DIR}/common/uchar.cpp
-${ICU_SOURCE_DIR}/common/uprops.cpp
-${ICU_SOURCE_DIR}/common/ucase.cpp
-${ICU_SOURCE_DIR}/common/propname.cpp
-${ICU_SOURCE_DIR}/common/ubidi_props.cpp
-${ICU_SOURCE_DIR}/common/characterproperties.cpp
-${ICU_SOURCE_DIR}/common/ubidi.cpp
-${ICU_SOURCE_DIR}/common/ubidiwrt.cpp
-${ICU_SOURCE_DIR}/common/ubidiln.cpp
-${ICU_SOURCE_DIR}/common/ushape.cpp
-${ICU_SOURCE_DIR}/common/uscript.cpp
-${ICU_SOURCE_DIR}/common/uscript_props.cpp
-${ICU_SOURCE_DIR}/common/usc_impl.cpp
-${ICU_SOURCE_DIR}/common/unames.cpp
-${ICU_SOURCE_DIR}/common/utrie.cpp
-${ICU_SOURCE_DIR}/common/utrie2.cpp
-${ICU_SOURCE_DIR}/common/utrie2_builder.cpp
-${ICU_SOURCE_DIR}/common/ucptrie.cpp
-${ICU_SOURCE_DIR}/common/umutablecptrie.cpp
-${ICU_SOURCE_DIR}/common/bmpset.cpp
-${ICU_SOURCE_DIR}/common/unisetspan.cpp
-${ICU_SOURCE_DIR}/common/uset_props.cpp
-${ICU_SOURCE_DIR}/common/uniset_props.cpp
-${ICU_SOURCE_DIR}/common/uniset_closure.cpp
-${ICU_SOURCE_DIR}/common/uset.cpp
-${ICU_SOURCE_DIR}/common/uniset.cpp
-${ICU_SOURCE_DIR}/common/usetiter.cpp
-${ICU_SOURCE_DIR}/common/ruleiter.cpp
-${ICU_SOURCE_DIR}/common/caniter.cpp
-${ICU_SOURCE_DIR}/common/unifilt.cpp
-${ICU_SOURCE_DIR}/common/unifunct.cpp
-${ICU_SOURCE_DIR}/common/uarrsort.cpp
-${ICU_SOURCE_DIR}/common/brkiter.cpp
-${ICU_SOURCE_DIR}/common/ubrk.cpp
-${ICU_SOURCE_DIR}/common/brkeng.cpp
-${ICU_SOURCE_DIR}/common/dictbe.cpp
-${ICU_SOURCE_DIR}/common/filteredbrk.cpp
-${ICU_SOURCE_DIR}/common/rbbi.cpp
-${ICU_SOURCE_DIR}/common/rbbidata.cpp
-${ICU_SOURCE_DIR}/common/rbbinode.cpp
-${ICU_SOURCE_DIR}/common/rbbirb.cpp
-${ICU_SOURCE_DIR}/common/rbbiscan.cpp
-${ICU_SOURCE_DIR}/common/rbbisetb.cpp
-${ICU_SOURCE_DIR}/common/rbbistbl.cpp
-${ICU_SOURCE_DIR}/common/rbbitblb.cpp
-${ICU_SOURCE_DIR}/common/rbbi_cache.cpp
-${ICU_SOURCE_DIR}/common/serv.cpp
-${ICU_SOURCE_DIR}/common/servnotf.cpp
-${ICU_SOURCE_DIR}/common/servls.cpp
-${ICU_SOURCE_DIR}/common/servlk.cpp
-${ICU_SOURCE_DIR}/common/servlkf.cpp
-${ICU_SOURCE_DIR}/common/servrbf.cpp
-${ICU_SOURCE_DIR}/common/servslkf.cpp
-${ICU_SOURCE_DIR}/common/uidna.cpp
-${ICU_SOURCE_DIR}/common/usprep.cpp
-${ICU_SOURCE_DIR}/common/uts46.cpp
-${ICU_SOURCE_DIR}/common/punycode.cpp
-${ICU_SOURCE_DIR}/common/util.cpp
-${ICU_SOURCE_DIR}/common/util_props.cpp
-${ICU_SOURCE_DIR}/common/parsepos.cpp
-${ICU_SOURCE_DIR}/common/locbased.cpp
-${ICU_SOURCE_DIR}/common/cwchar.cpp
-${ICU_SOURCE_DIR}/common/wintz.cpp
-${ICU_SOURCE_DIR}/common/dtintrv.cpp
-${ICU_SOURCE_DIR}/common/ucnvsel.cpp
-${ICU_SOURCE_DIR}/common/propsvec.cpp
-${ICU_SOURCE_DIR}/common/ulist.cpp
-${ICU_SOURCE_DIR}/common/uloc_tag.cpp
-${ICU_SOURCE_DIR}/common/icudataver.cpp
-${ICU_SOURCE_DIR}/common/icuplug.cpp
-${ICU_SOURCE_DIR}/common/sharedobject.cpp
-${ICU_SOURCE_DIR}/common/simpleformatter.cpp
-${ICU_SOURCE_DIR}/common/unifiedcache.cpp
-${ICU_SOURCE_DIR}/common/uloc_keytype.cpp
-${ICU_SOURCE_DIR}/common/ubiditransform.cpp
-${ICU_SOURCE_DIR}/common/pluralmap.cpp
-${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp
-${ICU_SOURCE_DIR}/common/restrace.cpp)
+"${ICU_SOURCE_DIR}/common/errorcode.cpp"
+"${ICU_SOURCE_DIR}/common/putil.cpp"
+"${ICU_SOURCE_DIR}/common/umath.cpp"
+"${ICU_SOURCE_DIR}/common/utypes.cpp"
+"${ICU_SOURCE_DIR}/common/uinvchar.cpp"
+"${ICU_SOURCE_DIR}/common/umutex.cpp"
+"${ICU_SOURCE_DIR}/common/ucln_cmn.cpp"
+"${ICU_SOURCE_DIR}/common/uinit.cpp"
+"${ICU_SOURCE_DIR}/common/uobject.cpp"
+"${ICU_SOURCE_DIR}/common/cmemory.cpp"
+"${ICU_SOURCE_DIR}/common/charstr.cpp"
+"${ICU_SOURCE_DIR}/common/cstr.cpp"
+"${ICU_SOURCE_DIR}/common/udata.cpp"
+"${ICU_SOURCE_DIR}/common/ucmndata.cpp"
+"${ICU_SOURCE_DIR}/common/udatamem.cpp"
+"${ICU_SOURCE_DIR}/common/umapfile.cpp"
+"${ICU_SOURCE_DIR}/common/udataswp.cpp"
+"${ICU_SOURCE_DIR}/common/utrie_swap.cpp"
+"${ICU_SOURCE_DIR}/common/ucol_swp.cpp"
+"${ICU_SOURCE_DIR}/common/utrace.cpp"
+"${ICU_SOURCE_DIR}/common/uhash.cpp"
+"${ICU_SOURCE_DIR}/common/uhash_us.cpp"
+"${ICU_SOURCE_DIR}/common/uenum.cpp"
+"${ICU_SOURCE_DIR}/common/ustrenum.cpp"
+"${ICU_SOURCE_DIR}/common/uvector.cpp"
+"${ICU_SOURCE_DIR}/common/ustack.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr32.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr64.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_bld.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_io.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_err.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvlat1.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u7.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u8.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u16.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u32.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvscsu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvbocu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ext.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv2022.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvhz.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvisci.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvdisp.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_set.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ct.cpp"
+"${ICU_SOURCE_DIR}/common/resource.cpp"
+"${ICU_SOURCE_DIR}/common/uresbund.cpp"
+"${ICU_SOURCE_DIR}/common/ures_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/uresdata.cpp"
+"${ICU_SOURCE_DIR}/common/resbund.cpp"
+"${ICU_SOURCE_DIR}/common/resbund_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucurr.cpp"
+"${ICU_SOURCE_DIR}/common/localebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/localeprioritylist.cpp"
+"${ICU_SOURCE_DIR}/common/messagepattern.cpp"
+"${ICU_SOURCE_DIR}/common/ucat.cpp"
+"${ICU_SOURCE_DIR}/common/locmap.cpp"
+"${ICU_SOURCE_DIR}/common/uloc.cpp"
+"${ICU_SOURCE_DIR}/common/locid.cpp"
+"${ICU_SOURCE_DIR}/common/locutil.cpp"
+"${ICU_SOURCE_DIR}/common/locavailable.cpp"
+"${ICU_SOURCE_DIR}/common/locdispnames.cpp"
+"${ICU_SOURCE_DIR}/common/locdspnm.cpp"
+"${ICU_SOURCE_DIR}/common/loclikely.cpp"
+"${ICU_SOURCE_DIR}/common/locresdata.cpp"
+"${ICU_SOURCE_DIR}/common/lsr.cpp"
+"${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp"
+"${ICU_SOURCE_DIR}/common/locdistance.cpp"
+"${ICU_SOURCE_DIR}/common/localematcher.cpp"
+"${ICU_SOURCE_DIR}/common/bytestream.cpp"
+"${ICU_SOURCE_DIR}/common/stringpiece.cpp"
+"${ICU_SOURCE_DIR}/common/bytesinkutil.cpp"
+"${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrie.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrie.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/dictionarydata.cpp"
+"${ICU_SOURCE_DIR}/common/edits.cpp"
+"${ICU_SOURCE_DIR}/common/appendable.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_props.cpp"
+"${ICU_SOURCE_DIR}/common/utf_impl.cpp"
+"${ICU_SOURCE_DIR}/common/ustring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/cstring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrfmt.cpp"
+"${ICU_SOURCE_DIR}/common/ustrtrns.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_wcs.cpp"
+"${ICU_SOURCE_DIR}/common/utext.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/normlzr.cpp"
+"${ICU_SOURCE_DIR}/common/unorm.cpp"
+"${ICU_SOURCE_DIR}/common/unormcmp.cpp"
+"${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/chariter.cpp"
+"${ICU_SOURCE_DIR}/common/schriter.cpp"
+"${ICU_SOURCE_DIR}/common/uchriter.cpp"
+"${ICU_SOURCE_DIR}/common/uiter.cpp"
+"${ICU_SOURCE_DIR}/common/patternprops.cpp"
+"${ICU_SOURCE_DIR}/common/uchar.cpp"
+"${ICU_SOURCE_DIR}/common/uprops.cpp"
+"${ICU_SOURCE_DIR}/common/ucase.cpp"
+"${ICU_SOURCE_DIR}/common/propname.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi_props.cpp"
+"${ICU_SOURCE_DIR}/common/characterproperties.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiwrt.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiln.cpp"
+"${ICU_SOURCE_DIR}/common/ushape.cpp"
+"${ICU_SOURCE_DIR}/common/uscript.cpp"
+"${ICU_SOURCE_DIR}/common/uscript_props.cpp"
+"${ICU_SOURCE_DIR}/common/usc_impl.cpp"
+"${ICU_SOURCE_DIR}/common/unames.cpp"
+"${ICU_SOURCE_DIR}/common/utrie.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2_builder.cpp"
+"${ICU_SOURCE_DIR}/common/ucptrie.cpp"
+"${ICU_SOURCE_DIR}/common/umutablecptrie.cpp"
+"${ICU_SOURCE_DIR}/common/bmpset.cpp"
+"${ICU_SOURCE_DIR}/common/unisetspan.cpp"
+"${ICU_SOURCE_DIR}/common/uset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_closure.cpp"
+"${ICU_SOURCE_DIR}/common/uset.cpp"
+"${ICU_SOURCE_DIR}/common/uniset.cpp"
+"${ICU_SOURCE_DIR}/common/usetiter.cpp"
+"${ICU_SOURCE_DIR}/common/ruleiter.cpp"
+"${ICU_SOURCE_DIR}/common/caniter.cpp"
+"${ICU_SOURCE_DIR}/common/unifilt.cpp"
+"${ICU_SOURCE_DIR}/common/unifunct.cpp"
+"${ICU_SOURCE_DIR}/common/uarrsort.cpp"
+"${ICU_SOURCE_DIR}/common/brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ubrk.cpp"
+"${ICU_SOURCE_DIR}/common/brkeng.cpp"
+"${ICU_SOURCE_DIR}/common/dictbe.cpp"
+"${ICU_SOURCE_DIR}/common/filteredbrk.cpp"
+"${ICU_SOURCE_DIR}/common/rbbi.cpp"
+"${ICU_SOURCE_DIR}/common/rbbidata.cpp"
+"${ICU_SOURCE_DIR}/common/rbbinode.cpp"
+"${ICU_SOURCE_DIR}/common/rbbirb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbiscan.cpp"
+"${ICU_SOURCE_DIR}/common/rbbisetb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbistbl.cpp"
+"${ICU_SOURCE_DIR}/common/rbbitblb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbi_cache.cpp"
+"${ICU_SOURCE_DIR}/common/serv.cpp"
+"${ICU_SOURCE_DIR}/common/servnotf.cpp"
+"${ICU_SOURCE_DIR}/common/servls.cpp"
+"${ICU_SOURCE_DIR}/common/servlk.cpp"
+"${ICU_SOURCE_DIR}/common/servlkf.cpp"
+"${ICU_SOURCE_DIR}/common/servrbf.cpp"
+"${ICU_SOURCE_DIR}/common/servslkf.cpp"
+"${ICU_SOURCE_DIR}/common/uidna.cpp"
+"${ICU_SOURCE_DIR}/common/usprep.cpp"
+"${ICU_SOURCE_DIR}/common/uts46.cpp"
+"${ICU_SOURCE_DIR}/common/punycode.cpp"
+"${ICU_SOURCE_DIR}/common/util.cpp"
+"${ICU_SOURCE_DIR}/common/util_props.cpp"
+"${ICU_SOURCE_DIR}/common/parsepos.cpp"
+"${ICU_SOURCE_DIR}/common/locbased.cpp"
+"${ICU_SOURCE_DIR}/common/cwchar.cpp"
+"${ICU_SOURCE_DIR}/common/wintz.cpp"
+"${ICU_SOURCE_DIR}/common/dtintrv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvsel.cpp"
+"${ICU_SOURCE_DIR}/common/propsvec.cpp"
+"${ICU_SOURCE_DIR}/common/ulist.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_tag.cpp"
+"${ICU_SOURCE_DIR}/common/icudataver.cpp"
+"${ICU_SOURCE_DIR}/common/icuplug.cpp"
+"${ICU_SOURCE_DIR}/common/sharedobject.cpp"
+"${ICU_SOURCE_DIR}/common/simpleformatter.cpp"
+"${ICU_SOURCE_DIR}/common/unifiedcache.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_keytype.cpp"
+"${ICU_SOURCE_DIR}/common/ubiditransform.cpp"
+"${ICU_SOURCE_DIR}/common/pluralmap.cpp"
+"${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp"
+"${ICU_SOURCE_DIR}/common/restrace.cpp")
 
 set(ICUI18N_SOURCES
-${ICU_SOURCE_DIR}/i18n/ucln_in.cpp
-${ICU_SOURCE_DIR}/i18n/fmtable.cpp
-${ICU_SOURCE_DIR}/i18n/format.cpp
-${ICU_SOURCE_DIR}/i18n/msgfmt.cpp
-${ICU_SOURCE_DIR}/i18n/umsg.cpp
-${ICU_SOURCE_DIR}/i18n/numfmt.cpp
-${ICU_SOURCE_DIR}/i18n/unum.cpp
-${ICU_SOURCE_DIR}/i18n/decimfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp
-${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp
-${ICU_SOURCE_DIR}/i18n/choicfmt.cpp
-${ICU_SOURCE_DIR}/i18n/datefmt.cpp
-${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp
-${ICU_SOURCE_DIR}/i18n/udat.cpp
-${ICU_SOURCE_DIR}/i18n/dtptngen.cpp
-${ICU_SOURCE_DIR}/i18n/udatpg.cpp
-${ICU_SOURCE_DIR}/i18n/nfrs.cpp
-${ICU_SOURCE_DIR}/i18n/nfrule.cpp
-${ICU_SOURCE_DIR}/i18n/nfsubs.cpp
-${ICU_SOURCE_DIR}/i18n/rbnf.cpp
-${ICU_SOURCE_DIR}/i18n/numsys.cpp
-${ICU_SOURCE_DIR}/i18n/unumsys.cpp
-${ICU_SOURCE_DIR}/i18n/ucsdet.cpp
-${ICU_SOURCE_DIR}/i18n/ucal.cpp
-${ICU_SOURCE_DIR}/i18n/calendar.cpp
-${ICU_SOURCE_DIR}/i18n/gregocal.cpp
-${ICU_SOURCE_DIR}/i18n/timezone.cpp
-${ICU_SOURCE_DIR}/i18n/simpletz.cpp
-${ICU_SOURCE_DIR}/i18n/olsontz.cpp
-${ICU_SOURCE_DIR}/i18n/astro.cpp
-${ICU_SOURCE_DIR}/i18n/taiwncal.cpp
-${ICU_SOURCE_DIR}/i18n/buddhcal.cpp
-${ICU_SOURCE_DIR}/i18n/persncal.cpp
-${ICU_SOURCE_DIR}/i18n/islamcal.cpp
-${ICU_SOURCE_DIR}/i18n/japancal.cpp
-${ICU_SOURCE_DIR}/i18n/gregoimp.cpp
-${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp
-${ICU_SOURCE_DIR}/i18n/indiancal.cpp
-${ICU_SOURCE_DIR}/i18n/chnsecal.cpp
-${ICU_SOURCE_DIR}/i18n/cecal.cpp
-${ICU_SOURCE_DIR}/i18n/coptccal.cpp
-${ICU_SOURCE_DIR}/i18n/dangical.cpp
-${ICU_SOURCE_DIR}/i18n/ethpccal.cpp
-${ICU_SOURCE_DIR}/i18n/coleitr.cpp
-${ICU_SOURCE_DIR}/i18n/coll.cpp
-${ICU_SOURCE_DIR}/i18n/sortkey.cpp
-${ICU_SOURCE_DIR}/i18n/bocsu.cpp
-${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp
-${ICU_SOURCE_DIR}/i18n/ucol.cpp
-${ICU_SOURCE_DIR}/i18n/ucol_res.cpp
-${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp
-${ICU_SOURCE_DIR}/i18n/collation.cpp
-${ICU_SOURCE_DIR}/i18n/collationsettings.cpp
-${ICU_SOURCE_DIR}/i18n/collationdata.cpp
-${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatareader.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatawriter.cpp
-${ICU_SOURCE_DIR}/i18n/collationfcd.cpp
-${ICU_SOURCE_DIR}/i18n/collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/collationsets.cpp
-${ICU_SOURCE_DIR}/i18n/collationcompare.cpp
-${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp
-${ICU_SOURCE_DIR}/i18n/collationkeys.cpp
-${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp
-${ICU_SOURCE_DIR}/i18n/collationroot.cpp
-${ICU_SOURCE_DIR}/i18n/collationrootelements.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp
-${ICU_SOURCE_DIR}/i18n/collationweights.cpp
-${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp
-${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp
-${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp
-${ICU_SOURCE_DIR}/i18n/listformatter.cpp
-${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp
-${ICU_SOURCE_DIR}/i18n/strmatch.cpp
-${ICU_SOURCE_DIR}/i18n/usearch.cpp
-${ICU_SOURCE_DIR}/i18n/search.cpp
-${ICU_SOURCE_DIR}/i18n/stsearch.cpp
-${ICU_SOURCE_DIR}/i18n/translit.cpp
-${ICU_SOURCE_DIR}/i18n/utrans.cpp
-${ICU_SOURCE_DIR}/i18n/esctrn.cpp
-${ICU_SOURCE_DIR}/i18n/unesctrn.cpp
-${ICU_SOURCE_DIR}/i18n/funcrepl.cpp
-${ICU_SOURCE_DIR}/i18n/strrepl.cpp
-${ICU_SOURCE_DIR}/i18n/tridpars.cpp
-${ICU_SOURCE_DIR}/i18n/cpdtrans.cpp
-${ICU_SOURCE_DIR}/i18n/rbt.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_data.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_set.cpp
-${ICU_SOURCE_DIR}/i18n/nultrans.cpp
-${ICU_SOURCE_DIR}/i18n/remtrans.cpp
-${ICU_SOURCE_DIR}/i18n/casetrn.cpp
-${ICU_SOURCE_DIR}/i18n/titletrn.cpp
-${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp
-${ICU_SOURCE_DIR}/i18n/toupptrn.cpp
-${ICU_SOURCE_DIR}/i18n/anytrans.cpp
-${ICU_SOURCE_DIR}/i18n/name2uni.cpp
-${ICU_SOURCE_DIR}/i18n/uni2name.cpp
-${ICU_SOURCE_DIR}/i18n/nortrans.cpp
-${ICU_SOURCE_DIR}/i18n/quant.cpp
-${ICU_SOURCE_DIR}/i18n/transreg.cpp
-${ICU_SOURCE_DIR}/i18n/brktrans.cpp
-${ICU_SOURCE_DIR}/i18n/regexcmp.cpp
-${ICU_SOURCE_DIR}/i18n/rematch.cpp
-${ICU_SOURCE_DIR}/i18n/repattrn.cpp
-${ICU_SOURCE_DIR}/i18n/regexst.cpp
-${ICU_SOURCE_DIR}/i18n/regextxt.cpp
-${ICU_SOURCE_DIR}/i18n/regeximp.cpp
-${ICU_SOURCE_DIR}/i18n/uregex.cpp
-${ICU_SOURCE_DIR}/i18n/uregexc.cpp
-${ICU_SOURCE_DIR}/i18n/ulocdata.cpp
-${ICU_SOURCE_DIR}/i18n/measfmt.cpp
-${ICU_SOURCE_DIR}/i18n/currfmt.cpp
-${ICU_SOURCE_DIR}/i18n/curramt.cpp
-${ICU_SOURCE_DIR}/i18n/currunit.cpp
-${ICU_SOURCE_DIR}/i18n/measure.cpp
-${ICU_SOURCE_DIR}/i18n/utmscale.cpp
-${ICU_SOURCE_DIR}/i18n/csdetect.cpp
-${ICU_SOURCE_DIR}/i18n/csmatch.cpp
-${ICU_SOURCE_DIR}/i18n/csr2022.cpp
-${ICU_SOURCE_DIR}/i18n/csrecog.cpp
-${ICU_SOURCE_DIR}/i18n/csrmbcs.cpp
-${ICU_SOURCE_DIR}/i18n/csrsbcs.cpp
-${ICU_SOURCE_DIR}/i18n/csrucode.cpp
-${ICU_SOURCE_DIR}/i18n/csrutf8.cpp
-${ICU_SOURCE_DIR}/i18n/inputext.cpp
-${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp
-${ICU_SOURCE_DIR}/i18n/windtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp
-${ICU_SOURCE_DIR}/i18n/basictz.cpp
-${ICU_SOURCE_DIR}/i18n/dtrule.cpp
-${ICU_SOURCE_DIR}/i18n/rbtz.cpp
-${ICU_SOURCE_DIR}/i18n/tzrule.cpp
-${ICU_SOURCE_DIR}/i18n/tztrans.cpp
-${ICU_SOURCE_DIR}/i18n/vtzone.cpp
-${ICU_SOURCE_DIR}/i18n/zonemeta.cpp
-${ICU_SOURCE_DIR}/i18n/standardplural.cpp
-${ICU_SOURCE_DIR}/i18n/upluralrules.cpp
-${ICU_SOURCE_DIR}/i18n/plurrule.cpp
-${ICU_SOURCE_DIR}/i18n/plurfmt.cpp
-${ICU_SOURCE_DIR}/i18n/selfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtitvfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtitvinf.cpp
-${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp
-${ICU_SOURCE_DIR}/i18n/tmunit.cpp
-${ICU_SOURCE_DIR}/i18n/tmutamt.cpp
-${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp
-${ICU_SOURCE_DIR}/i18n/currpinf.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp
-${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp
-${ICU_SOURCE_DIR}/i18n/ztrans.cpp
-${ICU_SOURCE_DIR}/i18n/zrule.cpp
-${ICU_SOURCE_DIR}/i18n/vzone.cpp
-${ICU_SOURCE_DIR}/i18n/fphdlimp.cpp
-${ICU_SOURCE_DIR}/i18n/fpositer.cpp
-${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp
-${ICU_SOURCE_DIR}/i18n/decNumber.cpp
-${ICU_SOURCE_DIR}/i18n/decContext.cpp
-${ICU_SOURCE_DIR}/i18n/alphaindex.cpp
-${ICU_SOURCE_DIR}/i18n/tznames.cpp
-${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp
-${ICU_SOURCE_DIR}/i18n/tzgnames.cpp
-${ICU_SOURCE_DIR}/i18n/tzfmt.cpp
-${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp
-${ICU_SOURCE_DIR}/i18n/gender.cpp
-${ICU_SOURCE_DIR}/i18n/region.cpp
-${ICU_SOURCE_DIR}/i18n/scriptset.cpp
-${ICU_SOURCE_DIR}/i18n/uregion.cpp
-${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp
-${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp
-${ICU_SOURCE_DIR}/i18n/measunit.cpp
-${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp
-${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp
-${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp
-${ICU_SOURCE_DIR}/i18n/nounit.cpp
-${ICU_SOURCE_DIR}/i18n/number_affixutils.cpp
-${ICU_SOURCE_DIR}/i18n/number_compact.cpp
-${ICU_SOURCE_DIR}/i18n/number_decimalquantity.cpp
-${ICU_SOURCE_DIR}/i18n/number_decimfmtprops.cpp
-${ICU_SOURCE_DIR}/i18n/number_fluent.cpp
-${ICU_SOURCE_DIR}/i18n/number_formatimpl.cpp
-${ICU_SOURCE_DIR}/i18n/number_grouping.cpp
-${ICU_SOURCE_DIR}/i18n/number_integerwidth.cpp
-${ICU_SOURCE_DIR}/i18n/number_longnames.cpp
-${ICU_SOURCE_DIR}/i18n/number_modifiers.cpp
-${ICU_SOURCE_DIR}/i18n/number_notation.cpp
-${ICU_SOURCE_DIR}/i18n/number_output.cpp
-${ICU_SOURCE_DIR}/i18n/number_padding.cpp
-${ICU_SOURCE_DIR}/i18n/number_patternmodifier.cpp
-${ICU_SOURCE_DIR}/i18n/number_patternstring.cpp
-${ICU_SOURCE_DIR}/i18n/number_rounding.cpp
-${ICU_SOURCE_DIR}/i18n/number_scientific.cpp
-${ICU_SOURCE_DIR}/i18n/number_utils.cpp
-${ICU_SOURCE_DIR}/i18n/number_asformat.cpp
-${ICU_SOURCE_DIR}/i18n/number_mapper.cpp
-${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp
-${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp
-${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp
-${ICU_SOURCE_DIR}/i18n/number_capi.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp
-${ICU_SOURCE_DIR}/i18n/string_segment.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_affixes.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_compositions.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_validators.cpp
-${ICU_SOURCE_DIR}/i18n/numrange_fluent.cpp
-${ICU_SOURCE_DIR}/i18n/numrange_impl.cpp
-${ICU_SOURCE_DIR}/i18n/erarules.cpp
-${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp
-${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp
-${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp
-${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp)
+"${ICU_SOURCE_DIR}/i18n/ucln_in.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable.cpp"
+"${ICU_SOURCE_DIR}/i18n/format.cpp"
+"${ICU_SOURCE_DIR}/i18n/msgfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/umsg.cpp"
+"${ICU_SOURCE_DIR}/i18n/numfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/unum.cpp"
+"${ICU_SOURCE_DIR}/i18n/decimfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp"
+"${ICU_SOURCE_DIR}/i18n/choicfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/datefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/udat.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtptngen.cpp"
+"${ICU_SOURCE_DIR}/i18n/udatpg.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrs.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfsubs.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbnf.cpp"
+"${ICU_SOURCE_DIR}/i18n/numsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/unumsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucsdet.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucal.cpp"
+"${ICU_SOURCE_DIR}/i18n/calendar.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregocal.cpp"
+"${ICU_SOURCE_DIR}/i18n/timezone.cpp"
+"${ICU_SOURCE_DIR}/i18n/simpletz.cpp"
+"${ICU_SOURCE_DIR}/i18n/olsontz.cpp"
+"${ICU_SOURCE_DIR}/i18n/astro.cpp"
+"${ICU_SOURCE_DIR}/i18n/taiwncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/buddhcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/persncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/islamcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/japancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregoimp.cpp"
+"${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/indiancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/chnsecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/cecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/coptccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/dangical.cpp"
+"${ICU_SOURCE_DIR}/i18n/ethpccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/coleitr.cpp"
+"${ICU_SOURCE_DIR}/i18n/coll.cpp"
+"${ICU_SOURCE_DIR}/i18n/sortkey.cpp"
+"${ICU_SOURCE_DIR}/i18n/bocsu.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_res.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp"
+"${ICU_SOURCE_DIR}/i18n/collation.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsettings.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdata.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatareader.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatawriter.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfcd.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsets.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationcompare.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationkeys.cpp"
+"${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationroot.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationrootelements.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationweights.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/listformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/strmatch.cpp"
+"${ICU_SOURCE_DIR}/i18n/usearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/search.cpp"
+"${ICU_SOURCE_DIR}/i18n/stsearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/translit.cpp"
+"${ICU_SOURCE_DIR}/i18n/utrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/esctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/unesctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/funcrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/strrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tridpars.cpp"
+"${ICU_SOURCE_DIR}/i18n/cpdtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_data.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_set.cpp"
+"${ICU_SOURCE_DIR}/i18n/nultrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/remtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/casetrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/titletrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/toupptrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/anytrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/name2uni.cpp"
+"${ICU_SOURCE_DIR}/i18n/uni2name.cpp"
+"${ICU_SOURCE_DIR}/i18n/nortrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/quant.cpp"
+"${ICU_SOURCE_DIR}/i18n/transreg.cpp"
+"${ICU_SOURCE_DIR}/i18n/brktrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexcmp.cpp"
+"${ICU_SOURCE_DIR}/i18n/rematch.cpp"
+"${ICU_SOURCE_DIR}/i18n/repattrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexst.cpp"
+"${ICU_SOURCE_DIR}/i18n/regextxt.cpp"
+"${ICU_SOURCE_DIR}/i18n/regeximp.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregex.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregexc.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulocdata.cpp"
+"${ICU_SOURCE_DIR}/i18n/measfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/curramt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/measure.cpp"
+"${ICU_SOURCE_DIR}/i18n/utmscale.cpp"
+"${ICU_SOURCE_DIR}/i18n/csdetect.cpp"
+"${ICU_SOURCE_DIR}/i18n/csmatch.cpp"
+"${ICU_SOURCE_DIR}/i18n/csr2022.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrecog.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrmbcs.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrsbcs.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrucode.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrutf8.cpp"
+"${ICU_SOURCE_DIR}/i18n/inputext.cpp"
+"${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/windtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/basictz.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbtz.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/tztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/vtzone.cpp"
+"${ICU_SOURCE_DIR}/i18n/zonemeta.cpp"
+"${ICU_SOURCE_DIR}/i18n/standardplural.cpp"
+"${ICU_SOURCE_DIR}/i18n/upluralrules.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/selfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtitvfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtitvinf.cpp"
+"${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutamt.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currpinf.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp"
+"${ICU_SOURCE_DIR}/i18n/ztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/zrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/vzone.cpp"
+"${ICU_SOURCE_DIR}/i18n/fphdlimp.cpp"
+"${ICU_SOURCE_DIR}/i18n/fpositer.cpp"
+"${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp"
+"${ICU_SOURCE_DIR}/i18n/decNumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/decContext.cpp"
+"${ICU_SOURCE_DIR}/i18n/alphaindex.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzgnames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/gender.cpp"
+"${ICU_SOURCE_DIR}/i18n/region.cpp"
+"${ICU_SOURCE_DIR}/i18n/scriptset.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregion.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/measunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp"
+"${ICU_SOURCE_DIR}/i18n/nounit.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_affixutils.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_compact.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_decimalquantity.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_decimfmtprops.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_fluent.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_formatimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_grouping.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_integerwidth.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_longnames.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_modifiers.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_notation.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_output.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_padding.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_patternmodifier.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_patternstring.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_rounding.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_scientific.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_utils.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_asformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_mapper.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_capi.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp"
+"${ICU_SOURCE_DIR}/i18n/string_segment.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_affixes.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_compositions.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_validators.cpp"
+"${ICU_SOURCE_DIR}/i18n/numrange_fluent.cpp"
+"${ICU_SOURCE_DIR}/i18n/numrange_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/erarules.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp")
 
-file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp CONTENT " ")
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp" CONTENT " ")
 enable_language(ASM)
 set(ICUDATA_SOURCES
-    ${ICUDATA_SOURCE_DIR}/icudt66l_dat.S
-    ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp # Without this cmake can incorrectly detects library type (OBJECT) instead of SHARED/STATIC
+    "${ICUDATA_SOURCE_DIR}/icudt66l_dat.S"
+    "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp" # Without this cmake can incorrectly detects library type (OBJECT) instead of SHARED/STATIC
 )
 
 # Note that we don't like any kind of binary plugins (because of runtime dependencies, vulnerabilities, ABI incompatibilities).
@@ -454,8 +454,8 @@ add_library(icudata ${ICUDATA_SOURCES})
 target_link_libraries(icuuc PRIVATE icudata)
 target_link_libraries(icui18n PRIVATE icuuc)
 
-target_include_directories(icuuc SYSTEM PUBLIC ${ICU_SOURCE_DIR}/common/)
-target_include_directories(icui18n SYSTEM PUBLIC ${ICU_SOURCE_DIR}/i18n/)
+target_include_directories(icuuc SYSTEM PUBLIC "${ICU_SOURCE_DIR}/common/")
+target_include_directories(icui18n SYSTEM PUBLIC "${ICU_SOURCE_DIR}/i18n/")
 
 target_compile_definitions(icuuc PRIVATE -DU_COMMON_IMPLEMENTATION)
 target_compile_definitions(icui18n PRIVATE -DU_I18N_IMPLEMENTATION)

contrib/jemalloc-cmake/CMakeLists.txt

@@ -52,46 +52,46 @@ 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
+    "${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)
+    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 PRIVATE "${LIBRARY_DIR}/include")
 target_include_directories(jemalloc SYSTEM PUBLIC include)
 
 set (JEMALLOC_INCLUDE_PREFIX)
@@ -119,7 +119,7 @@ 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)
+    "${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal")
 
 target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
 

contrib/libcxx-cmake/CMakeLists.txt

@@ -1,49 +1,49 @@
 include(CheckCXXCompilerFlag)
 
-set(LIBCXX_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcxx)
+set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxx")
 
 set(SRCS
-${LIBCXX_SOURCE_DIR}/src/algorithm.cpp
-${LIBCXX_SOURCE_DIR}/src/any.cpp
-${LIBCXX_SOURCE_DIR}/src/atomic.cpp
-${LIBCXX_SOURCE_DIR}/src/barrier.cpp
-${LIBCXX_SOURCE_DIR}/src/bind.cpp
-${LIBCXX_SOURCE_DIR}/src/charconv.cpp
-${LIBCXX_SOURCE_DIR}/src/chrono.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/debug.cpp
-${LIBCXX_SOURCE_DIR}/src/exception.cpp
-${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp
-${LIBCXX_SOURCE_DIR}/src/functional.cpp
-${LIBCXX_SOURCE_DIR}/src/future.cpp
-${LIBCXX_SOURCE_DIR}/src/hash.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp
-${LIBCXX_SOURCE_DIR}/src/iostream.cpp
-${LIBCXX_SOURCE_DIR}/src/locale.cpp
-${LIBCXX_SOURCE_DIR}/src/memory.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/new.cpp
-${LIBCXX_SOURCE_DIR}/src/optional.cpp
-${LIBCXX_SOURCE_DIR}/src/random.cpp
-${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp
-${LIBCXX_SOURCE_DIR}/src/regex.cpp
-${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp
-${LIBCXX_SOURCE_DIR}/src/string.cpp
-${LIBCXX_SOURCE_DIR}/src/strstream.cpp
-${LIBCXX_SOURCE_DIR}/src/system_error.cpp
-${LIBCXX_SOURCE_DIR}/src/thread.cpp
-${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp
-${LIBCXX_SOURCE_DIR}/src/utility.cpp
-${LIBCXX_SOURCE_DIR}/src/valarray.cpp
-${LIBCXX_SOURCE_DIR}/src/variant.cpp
-${LIBCXX_SOURCE_DIR}/src/vector.cpp
+"${LIBCXX_SOURCE_DIR}/src/algorithm.cpp"
+"${LIBCXX_SOURCE_DIR}/src/any.cpp"
+"${LIBCXX_SOURCE_DIR}/src/atomic.cpp"
+"${LIBCXX_SOURCE_DIR}/src/barrier.cpp"
+"${LIBCXX_SOURCE_DIR}/src/bind.cpp"
+"${LIBCXX_SOURCE_DIR}/src/charconv.cpp"
+"${LIBCXX_SOURCE_DIR}/src/chrono.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/debug.cpp"
+"${LIBCXX_SOURCE_DIR}/src/exception.cpp"
+"${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/functional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/future.cpp"
+"${LIBCXX_SOURCE_DIR}/src/hash.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/iostream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/locale.cpp"
+"${LIBCXX_SOURCE_DIR}/src/memory.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/new.cpp"
+"${LIBCXX_SOURCE_DIR}/src/optional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp"
+"${LIBCXX_SOURCE_DIR}/src/regex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp"
+"${LIBCXX_SOURCE_DIR}/src/string.cpp"
+"${LIBCXX_SOURCE_DIR}/src/strstream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/system_error.cpp"
+"${LIBCXX_SOURCE_DIR}/src/thread.cpp"
+"${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp"
+"${LIBCXX_SOURCE_DIR}/src/utility.cpp"
+"${LIBCXX_SOURCE_DIR}/src/valarray.cpp"
+"${LIBCXX_SOURCE_DIR}/src/variant.cpp"
+"${LIBCXX_SOURCE_DIR}/src/vector.cpp"
 )
 
 add_library(cxx ${SRCS})

contrib/libcxxabi-cmake/CMakeLists.txt

@@ -1,24 +1,24 @@
-set(LIBCXXABI_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcxxabi)
+set(LIBCXXABI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxxabi")
 
 set(SRCS
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp
-${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp
-${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp"
 )
 
 add_library(cxxabi ${SRCS})

contrib/libhdfs3-cmake/CMake/Options.cmake

@@ -22,7 +22,7 @@ ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
 
 TRY_COMPILE(STRERROR_R_RETURN_INT
 	${CMAKE_CURRENT_BINARY_DIR}
-	${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileStrerror.cpp
+	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileStrerror.cpp"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
 	OUTPUT_VARIABLE OUTPUT)
 
@@ -36,13 +36,13 @@ ENDIF(STRERROR_R_RETURN_INT)
 
 TRY_COMPILE(HAVE_STEADY_CLOCK
 	${CMAKE_CURRENT_BINARY_DIR}
-	${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileSteadyClock.cpp
+	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileSteadyClock.cpp"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
 	OUTPUT_VARIABLE OUTPUT)
 
 TRY_COMPILE(HAVE_NESTED_EXCEPTION
 	${CMAKE_CURRENT_BINARY_DIR}
-	${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileNestedException.cpp
+	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileNestedException.cpp"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
 	OUTPUT_VARIABLE OUTPUT)
 

contrib/libhdfs3-cmake/CMakeLists.txt

@@ -24,9 +24,9 @@ else()
 endif()
 
 # project and source dir
-set(HDFS3_ROOT_DIR ${ClickHouse_SOURCE_DIR}/contrib/libhdfs3)
-set(HDFS3_SOURCE_DIR ${HDFS3_ROOT_DIR}/src)
-set(HDFS3_COMMON_DIR ${HDFS3_SOURCE_DIR}/common)
+set(HDFS3_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3")
+set(HDFS3_SOURCE_DIR "${HDFS3_ROOT_DIR}/src")
+set(HDFS3_COMMON_DIR "${HDFS3_SOURCE_DIR}/common")
 
 # module
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
@@ -35,165 +35,165 @@ include(Options)
 
 # source
 set(PROTO_FILES
-    #${HDFS3_SOURCE_DIR}/proto/encryption.proto
-    ${HDFS3_SOURCE_DIR}/proto/ClientDatanodeProtocol.proto
-    ${HDFS3_SOURCE_DIR}/proto/hdfs.proto
-    ${HDFS3_SOURCE_DIR}/proto/Security.proto
-    ${HDFS3_SOURCE_DIR}/proto/ProtobufRpcEngine.proto
-    ${HDFS3_SOURCE_DIR}/proto/ClientNamenodeProtocol.proto
-    ${HDFS3_SOURCE_DIR}/proto/IpcConnectionContext.proto
-    ${HDFS3_SOURCE_DIR}/proto/RpcHeader.proto
-    ${HDFS3_SOURCE_DIR}/proto/datatransfer.proto
+    #"${HDFS3_SOURCE_DIR}/proto/encryption.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ClientDatanodeProtocol.proto"
+    "${HDFS3_SOURCE_DIR}/proto/hdfs.proto"
+    "${HDFS3_SOURCE_DIR}/proto/Security.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ProtobufRpcEngine.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ClientNamenodeProtocol.proto"
+    "${HDFS3_SOURCE_DIR}/proto/IpcConnectionContext.proto"
+    "${HDFS3_SOURCE_DIR}/proto/RpcHeader.proto"
+    "${HDFS3_SOURCE_DIR}/proto/datatransfer.proto"
     )
 
 if(USE_PROTOBUF)
     PROTOBUF_GENERATE_CPP(PROTO_SOURCES PROTO_HEADERS ${PROTO_FILES})
 endif()
 
-configure_file(${HDFS3_SOURCE_DIR}/platform.h.in ${CMAKE_CURRENT_BINARY_DIR}/platform.h)
+configure_file("${HDFS3_SOURCE_DIR}/platform.h.in" "${CMAKE_CURRENT_BINARY_DIR}/platform.h")
 
 set(SRCS
-    ${HDFS3_SOURCE_DIR}/network/TcpSocket.cpp
-    ${HDFS3_SOURCE_DIR}/network/DomainSocket.cpp
-    ${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.cpp
-    ${HDFS3_SOURCE_DIR}/client/Pipeline.cpp
-    ${HDFS3_SOURCE_DIR}/client/Hdfs.cpp
-    ${HDFS3_SOURCE_DIR}/client/Packet.cpp
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/KerberosName.cpp
-    ${HDFS3_SOURCE_DIR}/client/PacketHeader.cpp
-    ${HDFS3_SOURCE_DIR}/client/LocalBlockReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/UserInfo.cpp
-    ${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/Permission.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystemImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/DirectoryIterator.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystemKey.cpp
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.cpp
-    ${HDFS3_SOURCE_DIR}/client/LeaseRenewer.cpp
-    ${HDFS3_SOURCE_DIR}/client/PeerCache.cpp
-    ${HDFS3_SOURCE_DIR}/client/InputStream.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystem.cpp
-    ${HDFS3_SOURCE_DIR}/client/InputStreamImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/Token.cpp
-    ${HDFS3_SOURCE_DIR}/client/PacketPool.cpp
-    ${HDFS3_SOURCE_DIR}/client/OutputStream.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannel.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcAuth.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcConfig.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/SaslClient.cpp
-    ${HDFS3_SOURCE_DIR}/server/Datanode.cpp
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlocks.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeProxy.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeImpl.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeInfo.cpp
-    ${HDFS3_SOURCE_DIR}/common/WritableUtils.cpp
-    ${HDFS3_SOURCE_DIR}/common/ExceptionInternal.cpp
-    ${HDFS3_SOURCE_DIR}/common/SessionConfig.cpp
-    ${HDFS3_SOURCE_DIR}/common/StackPrinter.cpp
-    ${HDFS3_SOURCE_DIR}/common/Exception.cpp
-    ${HDFS3_SOURCE_DIR}/common/Logger.cpp
-    ${HDFS3_SOURCE_DIR}/common/CFileWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/common/XmlConfig.cpp
-    ${HDFS3_SOURCE_DIR}/common/WriteBuffer.cpp
-    ${HDFS3_SOURCE_DIR}/common/HWCrc32c.cpp
-    ${HDFS3_SOURCE_DIR}/common/MappedFileWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/common/Hash.cpp
-    ${HDFS3_SOURCE_DIR}/common/SWCrc32c.cpp
-    ${HDFS3_SOURCE_DIR}/common/Thread.cpp
+    "${HDFS3_SOURCE_DIR}/network/TcpSocket.cpp"
+    "${HDFS3_SOURCE_DIR}/network/DomainSocket.cpp"
+    "${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Pipeline.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Hdfs.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Packet.cpp"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/KerberosName.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PacketHeader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/LocalBlockReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/UserInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Permission.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/DirectoryIterator.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemKey.cpp"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.cpp"
+    "${HDFS3_SOURCE_DIR}/client/LeaseRenewer.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PeerCache.cpp"
+    "${HDFS3_SOURCE_DIR}/client/InputStream.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystem.cpp"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Token.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PacketPool.cpp"
+    "${HDFS3_SOURCE_DIR}/client/OutputStream.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannel.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcAuth.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/SaslClient.cpp"
+    "${HDFS3_SOURCE_DIR}/server/Datanode.cpp"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlocks.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeProxy.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/common/WritableUtils.cpp"
+    "${HDFS3_SOURCE_DIR}/common/ExceptionInternal.cpp"
+    "${HDFS3_SOURCE_DIR}/common/SessionConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/common/StackPrinter.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Exception.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Logger.cpp"
+    "${HDFS3_SOURCE_DIR}/common/CFileWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/common/XmlConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/common/WriteBuffer.cpp"
+    "${HDFS3_SOURCE_DIR}/common/HWCrc32c.cpp"
+    "${HDFS3_SOURCE_DIR}/common/MappedFileWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Hash.cpp"
+    "${HDFS3_SOURCE_DIR}/common/SWCrc32c.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Thread.cpp"
 
-    ${HDFS3_SOURCE_DIR}/network/TcpSocket.h
-    ${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.h
-    ${HDFS3_SOURCE_DIR}/network/Socket.h
-    ${HDFS3_SOURCE_DIR}/network/DomainSocket.h
-    ${HDFS3_SOURCE_DIR}/network/Syscall.h
-    ${HDFS3_SOURCE_DIR}/client/InputStreamImpl.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystem.h
-    ${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.h
-    ${HDFS3_SOURCE_DIR}/client/InputStreamInter.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemImpl.h
-    ${HDFS3_SOURCE_DIR}/client/PacketPool.h
-    ${HDFS3_SOURCE_DIR}/client/Pipeline.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamInter.h
-    ${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/Token.h
-    ${HDFS3_SOURCE_DIR}/client/KerberosName.h
-    ${HDFS3_SOURCE_DIR}/client/DirectoryIterator.h
-    ${HDFS3_SOURCE_DIR}/client/hdfs.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemStats.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemKey.h
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.h
-    ${HDFS3_SOURCE_DIR}/client/Packet.h
-    ${HDFS3_SOURCE_DIR}/client/PacketHeader.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemInter.h
-    ${HDFS3_SOURCE_DIR}/client/LocalBlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/TokenInternal.h
-    ${HDFS3_SOURCE_DIR}/client/InputStream.h
-    ${HDFS3_SOURCE_DIR}/client/PipelineAck.h
-    ${HDFS3_SOURCE_DIR}/client/BlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/Permission.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.h
-    ${HDFS3_SOURCE_DIR}/client/LeaseRenewer.h
-    ${HDFS3_SOURCE_DIR}/client/UserInfo.h
-    ${HDFS3_SOURCE_DIR}/client/PeerCache.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStream.h
-    ${HDFS3_SOURCE_DIR}/client/FileStatus.h
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocol.h
-    ${HDFS3_SOURCE_DIR}/client/BlockLocation.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcConfig.h
-    ${HDFS3_SOURCE_DIR}/rpc/SaslClient.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcAuth.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcClient.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcCall.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannel.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.h
-    ${HDFS3_SOURCE_DIR}/server/BlockLocalPathInfo.h
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlocks.h
-    ${HDFS3_SOURCE_DIR}/server/DatanodeInfo.h
-    ${HDFS3_SOURCE_DIR}/server/RpcHelper.h
-    ${HDFS3_SOURCE_DIR}/server/ExtendedBlock.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeInfo.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeImpl.h
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlock.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeProxy.h
-    ${HDFS3_SOURCE_DIR}/server/Datanode.h
-    ${HDFS3_SOURCE_DIR}/server/Namenode.h
-    ${HDFS3_SOURCE_DIR}/common/XmlConfig.h
-    ${HDFS3_SOURCE_DIR}/common/Logger.h
-    ${HDFS3_SOURCE_DIR}/common/WriteBuffer.h
-    ${HDFS3_SOURCE_DIR}/common/HWCrc32c.h
-    ${HDFS3_SOURCE_DIR}/common/Checksum.h
-    ${HDFS3_SOURCE_DIR}/common/SessionConfig.h
-    ${HDFS3_SOURCE_DIR}/common/Unordered.h
-    ${HDFS3_SOURCE_DIR}/common/BigEndian.h
-    ${HDFS3_SOURCE_DIR}/common/Thread.h
-    ${HDFS3_SOURCE_DIR}/common/StackPrinter.h
-    ${HDFS3_SOURCE_DIR}/common/Exception.h
-    ${HDFS3_SOURCE_DIR}/common/WritableUtils.h
-    ${HDFS3_SOURCE_DIR}/common/StringUtil.h
-    ${HDFS3_SOURCE_DIR}/common/LruMap.h
-    ${HDFS3_SOURCE_DIR}/common/Function.h
-    ${HDFS3_SOURCE_DIR}/common/DateTime.h
-    ${HDFS3_SOURCE_DIR}/common/Hash.h
-    ${HDFS3_SOURCE_DIR}/common/SWCrc32c.h
-    ${HDFS3_SOURCE_DIR}/common/ExceptionInternal.h
-    ${HDFS3_SOURCE_DIR}/common/Memory.h
-    ${HDFS3_SOURCE_DIR}/common/FileWrapper.h
+    "${HDFS3_SOURCE_DIR}/network/TcpSocket.h"
+    "${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.h"
+    "${HDFS3_SOURCE_DIR}/network/Socket.h"
+    "${HDFS3_SOURCE_DIR}/network/DomainSocket.h"
+    "${HDFS3_SOURCE_DIR}/network/Syscall.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystem.h"
+    "${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamInter.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/PacketPool.h"
+    "${HDFS3_SOURCE_DIR}/client/Pipeline.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamInter.h"
+    "${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/Token.h"
+    "${HDFS3_SOURCE_DIR}/client/KerberosName.h"
+    "${HDFS3_SOURCE_DIR}/client/DirectoryIterator.h"
+    "${HDFS3_SOURCE_DIR}/client/hdfs.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemStats.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemKey.h"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.h"
+    "${HDFS3_SOURCE_DIR}/client/Packet.h"
+    "${HDFS3_SOURCE_DIR}/client/PacketHeader.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemInter.h"
+    "${HDFS3_SOURCE_DIR}/client/LocalBlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/TokenInternal.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStream.h"
+    "${HDFS3_SOURCE_DIR}/client/PipelineAck.h"
+    "${HDFS3_SOURCE_DIR}/client/BlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/Permission.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/LeaseRenewer.h"
+    "${HDFS3_SOURCE_DIR}/client/UserInfo.h"
+    "${HDFS3_SOURCE_DIR}/client/PeerCache.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStream.h"
+    "${HDFS3_SOURCE_DIR}/client/FileStatus.h"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocol.h"
+    "${HDFS3_SOURCE_DIR}/client/BlockLocation.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcConfig.h"
+    "${HDFS3_SOURCE_DIR}/rpc/SaslClient.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcAuth.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcClient.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcCall.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannel.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.h"
+    "${HDFS3_SOURCE_DIR}/server/BlockLocalPathInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlocks.h"
+    "${HDFS3_SOURCE_DIR}/server/DatanodeInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/RpcHelper.h"
+    "${HDFS3_SOURCE_DIR}/server/ExtendedBlock.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeImpl.h"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlock.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeProxy.h"
+    "${HDFS3_SOURCE_DIR}/server/Datanode.h"
+    "${HDFS3_SOURCE_DIR}/server/Namenode.h"
+    "${HDFS3_SOURCE_DIR}/common/XmlConfig.h"
+    "${HDFS3_SOURCE_DIR}/common/Logger.h"
+    "${HDFS3_SOURCE_DIR}/common/WriteBuffer.h"
+    "${HDFS3_SOURCE_DIR}/common/HWCrc32c.h"
+    "${HDFS3_SOURCE_DIR}/common/Checksum.h"
+    "${HDFS3_SOURCE_DIR}/common/SessionConfig.h"
+    "${HDFS3_SOURCE_DIR}/common/Unordered.h"
+    "${HDFS3_SOURCE_DIR}/common/BigEndian.h"
+    "${HDFS3_SOURCE_DIR}/common/Thread.h"
+    "${HDFS3_SOURCE_DIR}/common/StackPrinter.h"
+    "${HDFS3_SOURCE_DIR}/common/Exception.h"
+    "${HDFS3_SOURCE_DIR}/common/WritableUtils.h"
+    "${HDFS3_SOURCE_DIR}/common/StringUtil.h"
+    "${HDFS3_SOURCE_DIR}/common/LruMap.h"
+    "${HDFS3_SOURCE_DIR}/common/Function.h"
+    "${HDFS3_SOURCE_DIR}/common/DateTime.h"
+    "${HDFS3_SOURCE_DIR}/common/Hash.h"
+    "${HDFS3_SOURCE_DIR}/common/SWCrc32c.h"
+    "${HDFS3_SOURCE_DIR}/common/ExceptionInternal.h"
+    "${HDFS3_SOURCE_DIR}/common/Memory.h"
+    "${HDFS3_SOURCE_DIR}/common/FileWrapper.h"
     )
 
 # old kernels (< 3.17) doesn't have SYS_getrandom. Always use POSIX implementation to have better compatibility
-set_source_files_properties(${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp PROPERTIES COMPILE_FLAGS "-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1")
+set_source_files_properties("${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp" PROPERTIES COMPILE_FLAGS "-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1")
 
 # target
 add_library(hdfs3 ${SRCS} ${PROTO_SOURCES} ${PROTO_HEADERS})

contrib/libpq-cmake/CMakeLists.txt

@@ -1,58 +1,58 @@
-set(LIBPQ_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpq)
+set(LIBPQ_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpq")
 
 set(SRCS
-        ${LIBPQ_SOURCE_DIR}/fe-auth.c
-        ${LIBPQ_SOURCE_DIR}/fe-auth-scram.c
-        ${LIBPQ_SOURCE_DIR}/fe-connect.c
-        ${LIBPQ_SOURCE_DIR}/fe-exec.c
-        ${LIBPQ_SOURCE_DIR}/fe-lobj.c
-        ${LIBPQ_SOURCE_DIR}/fe-misc.c
-        ${LIBPQ_SOURCE_DIR}/fe-print.c
-        ${LIBPQ_SOURCE_DIR}/fe-protocol2.c
-        ${LIBPQ_SOURCE_DIR}/fe-protocol3.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure-common.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure-openssl.c
-        ${LIBPQ_SOURCE_DIR}/legacy-pqsignal.c
-        ${LIBPQ_SOURCE_DIR}/libpq-events.c
-        ${LIBPQ_SOURCE_DIR}/pqexpbuffer.c
+        "${LIBPQ_SOURCE_DIR}/fe-auth.c"
+        "${LIBPQ_SOURCE_DIR}/fe-auth-scram.c"
+        "${LIBPQ_SOURCE_DIR}/fe-connect.c"
+        "${LIBPQ_SOURCE_DIR}/fe-exec.c"
+        "${LIBPQ_SOURCE_DIR}/fe-lobj.c"
+        "${LIBPQ_SOURCE_DIR}/fe-misc.c"
+        "${LIBPQ_SOURCE_DIR}/fe-print.c"
+        "${LIBPQ_SOURCE_DIR}/fe-protocol2.c"
+        "${LIBPQ_SOURCE_DIR}/fe-protocol3.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure-common.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure-openssl.c"
+        "${LIBPQ_SOURCE_DIR}/legacy-pqsignal.c"
+        "${LIBPQ_SOURCE_DIR}/libpq-events.c"
+        "${LIBPQ_SOURCE_DIR}/pqexpbuffer.c"
 
-        ${LIBPQ_SOURCE_DIR}/common/scram-common.c
-        ${LIBPQ_SOURCE_DIR}/common/sha2_openssl.c
-        ${LIBPQ_SOURCE_DIR}/common/md5.c
-        ${LIBPQ_SOURCE_DIR}/common/saslprep.c
-        ${LIBPQ_SOURCE_DIR}/common/unicode_norm.c
-        ${LIBPQ_SOURCE_DIR}/common/ip.c
-        ${LIBPQ_SOURCE_DIR}/common/jsonapi.c
-        ${LIBPQ_SOURCE_DIR}/common/wchar.c
-        ${LIBPQ_SOURCE_DIR}/common/base64.c
-        ${LIBPQ_SOURCE_DIR}/common/link-canary.c
-        ${LIBPQ_SOURCE_DIR}/common/fe_memutils.c
-        ${LIBPQ_SOURCE_DIR}/common/string.c
-        ${LIBPQ_SOURCE_DIR}/common/pg_get_line.c
-        ${LIBPQ_SOURCE_DIR}/common/stringinfo.c
-        ${LIBPQ_SOURCE_DIR}/common/psprintf.c
-        ${LIBPQ_SOURCE_DIR}/common/encnames.c
-        ${LIBPQ_SOURCE_DIR}/common/logging.c
+        "${LIBPQ_SOURCE_DIR}/common/scram-common.c"
+        "${LIBPQ_SOURCE_DIR}/common/sha2_openssl.c"
+        "${LIBPQ_SOURCE_DIR}/common/md5.c"
+        "${LIBPQ_SOURCE_DIR}/common/saslprep.c"
+        "${LIBPQ_SOURCE_DIR}/common/unicode_norm.c"
+        "${LIBPQ_SOURCE_DIR}/common/ip.c"
+        "${LIBPQ_SOURCE_DIR}/common/jsonapi.c"
+        "${LIBPQ_SOURCE_DIR}/common/wchar.c"
+        "${LIBPQ_SOURCE_DIR}/common/base64.c"
+        "${LIBPQ_SOURCE_DIR}/common/link-canary.c"
+        "${LIBPQ_SOURCE_DIR}/common/fe_memutils.c"
+        "${LIBPQ_SOURCE_DIR}/common/string.c"
+        "${LIBPQ_SOURCE_DIR}/common/pg_get_line.c"
+        "${LIBPQ_SOURCE_DIR}/common/stringinfo.c"
+        "${LIBPQ_SOURCE_DIR}/common/psprintf.c"
+        "${LIBPQ_SOURCE_DIR}/common/encnames.c"
+        "${LIBPQ_SOURCE_DIR}/common/logging.c"
 
-        ${LIBPQ_SOURCE_DIR}/port/snprintf.c
-        ${LIBPQ_SOURCE_DIR}/port/strlcpy.c
-        ${LIBPQ_SOURCE_DIR}/port/strerror.c
-        ${LIBPQ_SOURCE_DIR}/port/inet_net_ntop.c
-        ${LIBPQ_SOURCE_DIR}/port/getpeereid.c
-        ${LIBPQ_SOURCE_DIR}/port/chklocale.c
-        ${LIBPQ_SOURCE_DIR}/port/noblock.c
-        ${LIBPQ_SOURCE_DIR}/port/pg_strong_random.c
-        ${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c
-        ${LIBPQ_SOURCE_DIR}/port/thread.c
-        ${LIBPQ_SOURCE_DIR}/port/path.c
-        ${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c
+        "${LIBPQ_SOURCE_DIR}/port/snprintf.c"
+        "${LIBPQ_SOURCE_DIR}/port/strlcpy.c"
+        "${LIBPQ_SOURCE_DIR}/port/strerror.c"
+        "${LIBPQ_SOURCE_DIR}/port/inet_net_ntop.c"
+        "${LIBPQ_SOURCE_DIR}/port/getpeereid.c"
+        "${LIBPQ_SOURCE_DIR}/port/chklocale.c"
+        "${LIBPQ_SOURCE_DIR}/port/noblock.c"
+        "${LIBPQ_SOURCE_DIR}/port/pg_strong_random.c"
+        "${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c"
+        "${LIBPQ_SOURCE_DIR}/port/thread.c"
+        "${LIBPQ_SOURCE_DIR}/port/path.c"
+        "${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c"
         )
 
 add_library(libpq ${SRCS})
 
 target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR})
-target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR}/include)
-target_include_directories (libpq PRIVATE ${LIBPQ_SOURCE_DIR}/configs)
+target_include_directories (libpq PUBLIC "${LIBPQ_SOURCE_DIR}/include")
+target_include_directories (libpq PRIVATE "${LIBPQ_SOURCE_DIR}/configs")
 
 target_link_libraries (libpq PRIVATE ssl)

contrib/libpqxx-cmake/CMakeLists.txt

@@ -1,70 +1,70 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpqxx)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx")
 
 set (SRCS
-    ${LIBRARY_DIR}/src/strconv.cxx
-    ${LIBRARY_DIR}/src/array.cxx
-    ${LIBRARY_DIR}/src/binarystring.cxx
-    ${LIBRARY_DIR}/src/connection.cxx
-    ${LIBRARY_DIR}/src/cursor.cxx
-    ${LIBRARY_DIR}/src/encodings.cxx
-    ${LIBRARY_DIR}/src/errorhandler.cxx
-    ${LIBRARY_DIR}/src/except.cxx
-    ${LIBRARY_DIR}/src/field.cxx
-    ${LIBRARY_DIR}/src/largeobject.cxx
-    ${LIBRARY_DIR}/src/notification.cxx
-    ${LIBRARY_DIR}/src/pipeline.cxx
-    ${LIBRARY_DIR}/src/result.cxx
-    ${LIBRARY_DIR}/src/robusttransaction.cxx
-    ${LIBRARY_DIR}/src/sql_cursor.cxx
-    ${LIBRARY_DIR}/src/stream_from.cxx
-    ${LIBRARY_DIR}/src/stream_to.cxx
-    ${LIBRARY_DIR}/src/subtransaction.cxx
-    ${LIBRARY_DIR}/src/transaction.cxx
-    ${LIBRARY_DIR}/src/transaction_base.cxx
-    ${LIBRARY_DIR}/src/row.cxx
-    ${LIBRARY_DIR}/src/util.cxx
-    ${LIBRARY_DIR}/src/version.cxx
+    "${LIBRARY_DIR}/src/strconv.cxx"
+    "${LIBRARY_DIR}/src/array.cxx"
+    "${LIBRARY_DIR}/src/binarystring.cxx"
+    "${LIBRARY_DIR}/src/connection.cxx"
+    "${LIBRARY_DIR}/src/cursor.cxx"
+    "${LIBRARY_DIR}/src/encodings.cxx"
+    "${LIBRARY_DIR}/src/errorhandler.cxx"
+    "${LIBRARY_DIR}/src/except.cxx"
+    "${LIBRARY_DIR}/src/field.cxx"
+    "${LIBRARY_DIR}/src/largeobject.cxx"
+    "${LIBRARY_DIR}/src/notification.cxx"
+    "${LIBRARY_DIR}/src/pipeline.cxx"
+    "${LIBRARY_DIR}/src/result.cxx"
+    "${LIBRARY_DIR}/src/robusttransaction.cxx"
+    "${LIBRARY_DIR}/src/sql_cursor.cxx"
+    "${LIBRARY_DIR}/src/stream_from.cxx"
+    "${LIBRARY_DIR}/src/stream_to.cxx"
+    "${LIBRARY_DIR}/src/subtransaction.cxx"
+    "${LIBRARY_DIR}/src/transaction.cxx"
+    "${LIBRARY_DIR}/src/transaction_base.cxx"
+    "${LIBRARY_DIR}/src/row.cxx"
+    "${LIBRARY_DIR}/src/util.cxx"
+    "${LIBRARY_DIR}/src/version.cxx"
 )
 
 # Need to explicitly include each header file, because in the directory include/pqxx there are also files
 # like just 'array'. So if including the whole directory with `target_include_directories`, it will make
 # conflicts with all includes of <array>.
 set (HDRS
-    ${LIBRARY_DIR}/include/pqxx/array.hxx
-    ${LIBRARY_DIR}/include/pqxx/binarystring.hxx
-    ${LIBRARY_DIR}/include/pqxx/composite.hxx
-    ${LIBRARY_DIR}/include/pqxx/connection.hxx
-    ${LIBRARY_DIR}/include/pqxx/cursor.hxx
-    ${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/errorhandler.hxx
-    ${LIBRARY_DIR}/include/pqxx/except.hxx
-    ${LIBRARY_DIR}/include/pqxx/field.hxx
-    ${LIBRARY_DIR}/include/pqxx/isolation.hxx
-    ${LIBRARY_DIR}/include/pqxx/largeobject.hxx
-    ${LIBRARY_DIR}/include/pqxx/nontransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/notification.hxx
-    ${LIBRARY_DIR}/include/pqxx/pipeline.hxx
-    ${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx
-    ${LIBRARY_DIR}/include/pqxx/result.hxx
-    ${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/row.hxx
-    ${LIBRARY_DIR}/include/pqxx/separated_list.hxx
-    ${LIBRARY_DIR}/include/pqxx/strconv.hxx
-    ${LIBRARY_DIR}/include/pqxx/stream_from.hxx
-    ${LIBRARY_DIR}/include/pqxx/stream_to.hxx
-    ${LIBRARY_DIR}/include/pqxx/subtransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/transaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/transaction_base.hxx
-    ${LIBRARY_DIR}/include/pqxx/types.hxx
-    ${LIBRARY_DIR}/include/pqxx/util.hxx
-    ${LIBRARY_DIR}/include/pqxx/version.hxx
-    ${LIBRARY_DIR}/include/pqxx/zview.hxx
+    "${LIBRARY_DIR}/include/pqxx/array.hxx"
+    "${LIBRARY_DIR}/include/pqxx/binarystring.hxx"
+    "${LIBRARY_DIR}/include/pqxx/composite.hxx"
+    "${LIBRARY_DIR}/include/pqxx/connection.hxx"
+    "${LIBRARY_DIR}/include/pqxx/cursor.hxx"
+    "${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/errorhandler.hxx"
+    "${LIBRARY_DIR}/include/pqxx/except.hxx"
+    "${LIBRARY_DIR}/include/pqxx/field.hxx"
+    "${LIBRARY_DIR}/include/pqxx/isolation.hxx"
+    "${LIBRARY_DIR}/include/pqxx/largeobject.hxx"
+    "${LIBRARY_DIR}/include/pqxx/nontransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/notification.hxx"
+    "${LIBRARY_DIR}/include/pqxx/pipeline.hxx"
+    "${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx"
+    "${LIBRARY_DIR}/include/pqxx/result.hxx"
+    "${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/row.hxx"
+    "${LIBRARY_DIR}/include/pqxx/separated_list.hxx"
+    "${LIBRARY_DIR}/include/pqxx/strconv.hxx"
+    "${LIBRARY_DIR}/include/pqxx/stream_from.hxx"
+    "${LIBRARY_DIR}/include/pqxx/stream_to.hxx"
+    "${LIBRARY_DIR}/include/pqxx/subtransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/transaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/transaction_base.hxx"
+    "${LIBRARY_DIR}/include/pqxx/types.hxx"
+    "${LIBRARY_DIR}/include/pqxx/util.hxx"
+    "${LIBRARY_DIR}/include/pqxx/version.hxx"
+    "${LIBRARY_DIR}/include/pqxx/zview.hxx"
 )
 
 add_library(libpqxx ${SRCS} ${HDRS})
 
 target_link_libraries(libpqxx PUBLIC ${LIBPQ_LIBRARY})
-target_include_directories (libpqxx PRIVATE ${LIBRARY_DIR}/include)
+target_include_directories (libpqxx PRIVATE "${LIBRARY_DIR}/include")
 
 # crutch
 set(CM_CONFIG_H_IN "${LIBRARY_DIR}/include/pqxx/config.h.in")

contrib/librdkafka

@@ -1 +1 @@
-Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76
+Subproject commit 43491d33ca2826531d1e3cae70d4bf1e5249e3c9

contrib/librdkafka-cmake/CMakeLists.txt

@@ -1,83 +1,83 @@
-set(RDKAFKA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src)
+set(RDKAFKA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
 
 set(SRCS
-  ${RDKAFKA_SOURCE_DIR}/crc32c.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4frame.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4hc.c
-  ${RDKAFKA_SOURCE_DIR}/rdaddr.c
-  ${RDKAFKA_SOURCE_DIR}/rdavl.c
-  ${RDKAFKA_SOURCE_DIR}/rdbuf.c
-  ${RDKAFKA_SOURCE_DIR}/rdcrc32.c
-  ${RDKAFKA_SOURCE_DIR}/rddl.c
-  ${RDKAFKA_SOURCE_DIR}/rdfnv1a.c
-  ${RDKAFKA_SOURCE_DIR}/rdgz.c
-  ${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c # looks optional
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c # looks optional
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_background.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_coord.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_error.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_event.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock_cgrp.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock_handlers.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msg.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_reader.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_writer.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_offset.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_op.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_partition.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_pattern.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_plugin.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_queue.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_range_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c        # optionally included below
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c  # optionally included below
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c        # optionally included below
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c               # optionally included below
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
-  ${RDKAFKA_SOURCE_DIR}/rdlist.c
-  ${RDKAFKA_SOURCE_DIR}/rdlog.c
-  ${RDKAFKA_SOURCE_DIR}/rdmap.c
-  ${RDKAFKA_SOURCE_DIR}/rdmurmur2.c
-  ${RDKAFKA_SOURCE_DIR}/rdports.c
-  ${RDKAFKA_SOURCE_DIR}/rdrand.c
-  ${RDKAFKA_SOURCE_DIR}/rdregex.c
-  ${RDKAFKA_SOURCE_DIR}/rdstring.c
-  ${RDKAFKA_SOURCE_DIR}/rdunittest.c
-  ${RDKAFKA_SOURCE_DIR}/rdvarint.c
-  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
-  # ${RDKAFKA_SOURCE_DIR}/regexp.c
-  ${RDKAFKA_SOURCE_DIR}/snappy.c
-  ${RDKAFKA_SOURCE_DIR}/tinycthread.c
-  ${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c
+  "${RDKAFKA_SOURCE_DIR}/crc32c.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4frame.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4hc.c"
+  "${RDKAFKA_SOURCE_DIR}/rdaddr.c"
+  "${RDKAFKA_SOURCE_DIR}/rdavl.c"
+  "${RDKAFKA_SOURCE_DIR}/rdbuf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdcrc32.c"
+  "${RDKAFKA_SOURCE_DIR}/rddl.c"
+  "${RDKAFKA_SOURCE_DIR}/rdfnv1a.c"
+  "${RDKAFKA_SOURCE_DIR}/rdgz.c"
+  "${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c" # looks optional
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c" # looks optional
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_background.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_coord.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_error.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_event.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_header.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock_cgrp.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock_handlers.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msg.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_reader.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_writer.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_offset.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_op.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_partition.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_pattern.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_plugin.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_queue.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_range_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_request.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c"        # optionally included below
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c"  # optionally included below
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c"        # optionally included below
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c"               # optionally included below
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c"
+  "${RDKAFKA_SOURCE_DIR}/rdlist.c"
+  "${RDKAFKA_SOURCE_DIR}/rdlog.c"
+  "${RDKAFKA_SOURCE_DIR}/rdmap.c"
+  "${RDKAFKA_SOURCE_DIR}/rdmurmur2.c"
+  "${RDKAFKA_SOURCE_DIR}/rdports.c"
+  "${RDKAFKA_SOURCE_DIR}/rdrand.c"
+  "${RDKAFKA_SOURCE_DIR}/rdregex.c"
+  "${RDKAFKA_SOURCE_DIR}/rdstring.c"
+  "${RDKAFKA_SOURCE_DIR}/rdunittest.c"
+  "${RDKAFKA_SOURCE_DIR}/rdvarint.c"
+  "${RDKAFKA_SOURCE_DIR}/rdxxhash.c"
+  # "${RDKAFKA_SOURCE_DIR}/regexp.c"
+  "${RDKAFKA_SOURCE_DIR}/snappy.c"
+  "${RDKAFKA_SOURCE_DIR}/tinycthread.c"
+  "${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c"
 )
 
 if(${ENABLE_CYRUS_SASL})
@@ -96,28 +96,28 @@ if(OPENSSL_FOUND)
 endif()
 
 if(WITH_SSL)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c")
 endif()
 
 if(WITH_SASL_CYRUS)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c) # needed to support Kerberos, requires cyrus-sasl
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c") # needed to support Kerberos, requires cyrus-sasl
 endif()
 
 if(WITH_SASL_SCRAM)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c")
 endif()
 
 if(WITH_SASL_OAUTHBEARER)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c")
 endif()
 
 add_library(rdkafka ${SRCS})
 target_compile_options(rdkafka PRIVATE -fno-sanitize=undefined)
 # target_include_directories(rdkafka SYSTEM PUBLIC include)
-target_include_directories(rdkafka SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)  # for "librdkafka/rdkafka.h"
+target_include_directories(rdkafka SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")  # for "librdkafka/rdkafka.h"
 target_include_directories(rdkafka SYSTEM PUBLIC ${RDKAFKA_SOURCE_DIR})         # Because weird logic with "include_next" is used.
-target_include_directories(rdkafka SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/auxdir)  # for "../config.h"
-target_include_directories(rdkafka SYSTEM PRIVATE ${ZSTD_INCLUDE_DIR}/common)   # Because wrong path to "zstd_errors.h" is used.
+target_include_directories(rdkafka SYSTEM PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/auxdir")  # for "../config.h"
+target_include_directories(rdkafka SYSTEM PRIVATE "${ZSTD_INCLUDE_DIR}/common")   # Because wrong path to "zstd_errors.h" is used.
 target_link_libraries(rdkafka PRIVATE lz4 ${ZLIB_LIBRARIES} ${ZSTD_LIBRARY})
 if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
     target_link_libraries(rdkafka PRIVATE ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
@@ -126,7 +126,7 @@ if(${ENABLE_CYRUS_SASL})
     target_link_libraries(rdkafka PRIVATE ${CYRUS_SASL_LIBRARY})
 endif()
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/auxdir)
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/auxdir")
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"

contrib/libunwind-cmake/CMakeLists.txt

@@ -1,27 +1,27 @@
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 
-set(LIBUNWIND_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libunwind)
+set(LIBUNWIND_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libunwind")
 
 set(LIBUNWIND_CXX_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/libunwind.cpp
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-EHABI.cpp
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-seh.cpp)
+    "${LIBUNWIND_SOURCE_DIR}/src/libunwind.cpp"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-EHABI.cpp"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-seh.cpp")
 if (APPLE)
-    set(LIBUNWIND_CXX_SOURCES ${LIBUNWIND_CXX_SOURCES} ${LIBUNWIND_SOURCE_DIR}/src/Unwind_AppleExtras.cpp)
+    set(LIBUNWIND_CXX_SOURCES ${LIBUNWIND_CXX_SOURCES} "${LIBUNWIND_SOURCE_DIR}/src/Unwind_AppleExtras.cpp")
 endif ()
 
 set(LIBUNWIND_C_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1.c
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1-gcc-ext.c
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-sjlj.c
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1.c"
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1-gcc-ext.c"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-sjlj.c"
     # Use unw_backtrace to override libgcc's backtrace symbol for better ABI compatibility
     unwind-override.c)
 set_source_files_properties(${LIBUNWIND_C_SOURCES} PROPERTIES COMPILE_FLAGS "-std=c99")
 
 set(LIBUNWIND_ASM_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersRestore.S
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersSave.S)
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersRestore.S"
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersSave.S")
 
 # CMake doesn't pass the correct architecture for Apple prior to CMake 3.19 [1]
 # Workaround these two issues by compiling as C.

contrib/libxml2-cmake/CMakeLists.txt

@@ -1,54 +1,54 @@
-set(LIBXML2_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libxml2)
-set(LIBXML2_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/libxml2)
+set(LIBXML2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libxml2")
+set(LIBXML2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libxml2")
 
 set(SRCS
-    ${LIBXML2_SOURCE_DIR}/SAX.c
-    ${LIBXML2_SOURCE_DIR}/entities.c
-    ${LIBXML2_SOURCE_DIR}/encoding.c
-    ${LIBXML2_SOURCE_DIR}/error.c
-    ${LIBXML2_SOURCE_DIR}/parserInternals.c
-    ${LIBXML2_SOURCE_DIR}/parser.c
-    ${LIBXML2_SOURCE_DIR}/tree.c
-    ${LIBXML2_SOURCE_DIR}/hash.c
-    ${LIBXML2_SOURCE_DIR}/list.c
-    ${LIBXML2_SOURCE_DIR}/xmlIO.c
-    ${LIBXML2_SOURCE_DIR}/xmlmemory.c
-    ${LIBXML2_SOURCE_DIR}/uri.c
-    ${LIBXML2_SOURCE_DIR}/valid.c
-    ${LIBXML2_SOURCE_DIR}/xlink.c
-    ${LIBXML2_SOURCE_DIR}/HTMLparser.c
-    ${LIBXML2_SOURCE_DIR}/HTMLtree.c
-    ${LIBXML2_SOURCE_DIR}/debugXML.c
-    ${LIBXML2_SOURCE_DIR}/xpath.c
-    ${LIBXML2_SOURCE_DIR}/xpointer.c
-    ${LIBXML2_SOURCE_DIR}/xinclude.c
-    ${LIBXML2_SOURCE_DIR}/nanohttp.c
-    ${LIBXML2_SOURCE_DIR}/nanoftp.c
-    ${LIBXML2_SOURCE_DIR}/DOCBparser.c
-    ${LIBXML2_SOURCE_DIR}/catalog.c
-    ${LIBXML2_SOURCE_DIR}/globals.c
-    ${LIBXML2_SOURCE_DIR}/threads.c
-    ${LIBXML2_SOURCE_DIR}/c14n.c
-    ${LIBXML2_SOURCE_DIR}/xmlstring.c
-    ${LIBXML2_SOURCE_DIR}/buf.c
-    ${LIBXML2_SOURCE_DIR}/xmlregexp.c
-    ${LIBXML2_SOURCE_DIR}/xmlschemas.c
-    ${LIBXML2_SOURCE_DIR}/xmlschemastypes.c
-    ${LIBXML2_SOURCE_DIR}/xmlunicode.c
-    ${LIBXML2_SOURCE_DIR}/triostr.c
-    #${LIBXML2_SOURCE_DIR}/trio.c
-    ${LIBXML2_SOURCE_DIR}/xmlreader.c
-    ${LIBXML2_SOURCE_DIR}/relaxng.c
-    ${LIBXML2_SOURCE_DIR}/dict.c
-    ${LIBXML2_SOURCE_DIR}/SAX2.c
-    ${LIBXML2_SOURCE_DIR}/xmlwriter.c
-    ${LIBXML2_SOURCE_DIR}/legacy.c
-    ${LIBXML2_SOURCE_DIR}/chvalid.c
-    ${LIBXML2_SOURCE_DIR}/pattern.c
-    ${LIBXML2_SOURCE_DIR}/xmlsave.c
-    ${LIBXML2_SOURCE_DIR}/xmlmodule.c
-    ${LIBXML2_SOURCE_DIR}/schematron.c
-    ${LIBXML2_SOURCE_DIR}/xzlib.c
+    "${LIBXML2_SOURCE_DIR}/SAX.c"
+    "${LIBXML2_SOURCE_DIR}/entities.c"
+    "${LIBXML2_SOURCE_DIR}/encoding.c"
+    "${LIBXML2_SOURCE_DIR}/error.c"
+    "${LIBXML2_SOURCE_DIR}/parserInternals.c"
+    "${LIBXML2_SOURCE_DIR}/parser.c"
+    "${LIBXML2_SOURCE_DIR}/tree.c"
+    "${LIBXML2_SOURCE_DIR}/hash.c"
+    "${LIBXML2_SOURCE_DIR}/list.c"
+    "${LIBXML2_SOURCE_DIR}/xmlIO.c"
+    "${LIBXML2_SOURCE_DIR}/xmlmemory.c"
+    "${LIBXML2_SOURCE_DIR}/uri.c"
+    "${LIBXML2_SOURCE_DIR}/valid.c"
+    "${LIBXML2_SOURCE_DIR}/xlink.c"
+    "${LIBXML2_SOURCE_DIR}/HTMLparser.c"
+    "${LIBXML2_SOURCE_DIR}/HTMLtree.c"
+    "${LIBXML2_SOURCE_DIR}/debugXML.c"
+    "${LIBXML2_SOURCE_DIR}/xpath.c"
+    "${LIBXML2_SOURCE_DIR}/xpointer.c"
+    "${LIBXML2_SOURCE_DIR}/xinclude.c"
+    "${LIBXML2_SOURCE_DIR}/nanohttp.c"
+    "${LIBXML2_SOURCE_DIR}/nanoftp.c"
+    "${LIBXML2_SOURCE_DIR}/DOCBparser.c"
+    "${LIBXML2_SOURCE_DIR}/catalog.c"
+    "${LIBXML2_SOURCE_DIR}/globals.c"
+    "${LIBXML2_SOURCE_DIR}/threads.c"
+    "${LIBXML2_SOURCE_DIR}/c14n.c"
+    "${LIBXML2_SOURCE_DIR}/xmlstring.c"
+    "${LIBXML2_SOURCE_DIR}/buf.c"
+    "${LIBXML2_SOURCE_DIR}/xmlregexp.c"
+    "${LIBXML2_SOURCE_DIR}/xmlschemas.c"
+    "${LIBXML2_SOURCE_DIR}/xmlschemastypes.c"
+    "${LIBXML2_SOURCE_DIR}/xmlunicode.c"
+    "${LIBXML2_SOURCE_DIR}/triostr.c"
+    #"${LIBXML2_SOURCE_DIR}/trio.c"
+    "${LIBXML2_SOURCE_DIR}/xmlreader.c"
+    "${LIBXML2_SOURCE_DIR}/relaxng.c"
+    "${LIBXML2_SOURCE_DIR}/dict.c"
+    "${LIBXML2_SOURCE_DIR}/SAX2.c"
+    "${LIBXML2_SOURCE_DIR}/xmlwriter.c"
+    "${LIBXML2_SOURCE_DIR}/legacy.c"
+    "${LIBXML2_SOURCE_DIR}/chvalid.c"
+    "${LIBXML2_SOURCE_DIR}/pattern.c"
+    "${LIBXML2_SOURCE_DIR}/xmlsave.c"
+    "${LIBXML2_SOURCE_DIR}/xmlmodule.c"
+    "${LIBXML2_SOURCE_DIR}/schematron.c"
+    "${LIBXML2_SOURCE_DIR}/xzlib.c"
 )
 add_library(libxml2 ${SRCS})
 
@@ -57,6 +57,6 @@ if(M_LIBRARY)
     target_link_libraries(libxml2 PRIVATE ${M_LIBRARY})
 endif()
 
-target_include_directories(libxml2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include)
-target_include_directories(libxml2 PUBLIC ${LIBXML2_SOURCE_DIR}/include)
+target_include_directories(libxml2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include")
+target_include_directories(libxml2 PUBLIC "${LIBXML2_SOURCE_DIR}/include")
 target_include_directories(libxml2 SYSTEM BEFORE PRIVATE ${ZLIB_INCLUDE_DIR})

contrib/llvm

@@ -1 +1 @@
-Subproject commit 8f24d507c1cfeec66d27f48fe74518fd278e2d25
+Subproject commit cfaf365cf96918999d09d976ec736b4518cf5d02

contrib/lz4-cmake/CMakeLists.txt

@@ -33,5 +33,5 @@ if (NOT EXTERNAL_LZ4_LIBRARY_FOUND)
     if (SANITIZE STREQUAL "undefined")
         target_compile_options (lz4 PRIVATE -fno-sanitize=undefined)
     endif ()
-    target_include_directories(lz4 PUBLIC ${LIBRARY_DIR}/lib)
+    target_include_directories(lz4 PUBLIC "${LIBRARY_DIR}/lib")
 endif ()

contrib/nanodbc-cmake/CMakeLists.txt

@@ -1,14 +1,18 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/nanodbc)
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    return ()
+endif ()
+
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
 
 if (NOT TARGET unixodbc)
     message(FATAL_ERROR "Configuration error: unixodbc is not a target")
 endif()
 
 set (SRCS
-    ${LIBRARY_DIR}/nanodbc/nanodbc.cpp
+    "${LIBRARY_DIR}/nanodbc/nanodbc.cpp"
 )
 
 add_library(nanodbc ${SRCS})
 
 target_link_libraries (nanodbc PUBLIC unixodbc)
-target_include_directories (nanodbc SYSTEM PUBLIC ${LIBRARY_DIR}/)
+target_include_directories (nanodbc SYSTEM PUBLIC "${LIBRARY_DIR}/")

contrib/nuraft-cmake/CMakeLists.txt

@@ -1,30 +1,30 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/NuRaft)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/NuRaft")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/handle_priority.cxx
-    ${LIBRARY_DIR}/src/buffer_serializer.cxx
-    ${LIBRARY_DIR}/src/peer.cxx
-    ${LIBRARY_DIR}/src/global_mgr.cxx
-    ${LIBRARY_DIR}/src/buffer.cxx
-    ${LIBRARY_DIR}/src/asio_service.cxx
-    ${LIBRARY_DIR}/src/handle_client_request.cxx
-    ${LIBRARY_DIR}/src/raft_server.cxx
-    ${LIBRARY_DIR}/src/snapshot.cxx
-    ${LIBRARY_DIR}/src/handle_commit.cxx
-    ${LIBRARY_DIR}/src/error_code.cxx
-    ${LIBRARY_DIR}/src/crc32.cxx
-    ${LIBRARY_DIR}/src/handle_snapshot_sync.cxx
-    ${LIBRARY_DIR}/src/stat_mgr.cxx
-    ${LIBRARY_DIR}/src/handle_join_leave.cxx
-    ${LIBRARY_DIR}/src/handle_user_cmd.cxx
-    ${LIBRARY_DIR}/src/handle_custom_notification.cxx
-    ${LIBRARY_DIR}/src/handle_vote.cxx
-    ${LIBRARY_DIR}/src/launcher.cxx
-    ${LIBRARY_DIR}/src/srv_config.cxx
-    ${LIBRARY_DIR}/src/snapshot_sync_req.cxx
-    ${LIBRARY_DIR}/src/handle_timeout.cxx
-    ${LIBRARY_DIR}/src/handle_append_entries.cxx
-    ${LIBRARY_DIR}/src/cluster_config.cxx
+    "${LIBRARY_DIR}/src/handle_priority.cxx"
+    "${LIBRARY_DIR}/src/buffer_serializer.cxx"
+    "${LIBRARY_DIR}/src/peer.cxx"
+    "${LIBRARY_DIR}/src/global_mgr.cxx"
+    "${LIBRARY_DIR}/src/buffer.cxx"
+    "${LIBRARY_DIR}/src/asio_service.cxx"
+    "${LIBRARY_DIR}/src/handle_client_request.cxx"
+    "${LIBRARY_DIR}/src/raft_server.cxx"
+    "${LIBRARY_DIR}/src/snapshot.cxx"
+    "${LIBRARY_DIR}/src/handle_commit.cxx"
+    "${LIBRARY_DIR}/src/error_code.cxx"
+    "${LIBRARY_DIR}/src/crc32.cxx"
+    "${LIBRARY_DIR}/src/handle_snapshot_sync.cxx"
+    "${LIBRARY_DIR}/src/stat_mgr.cxx"
+    "${LIBRARY_DIR}/src/handle_join_leave.cxx"
+    "${LIBRARY_DIR}/src/handle_user_cmd.cxx"
+    "${LIBRARY_DIR}/src/handle_custom_notification.cxx"
+    "${LIBRARY_DIR}/src/handle_vote.cxx"
+    "${LIBRARY_DIR}/src/launcher.cxx"
+    "${LIBRARY_DIR}/src/srv_config.cxx"
+    "${LIBRARY_DIR}/src/snapshot_sync_req.cxx"
+    "${LIBRARY_DIR}/src/handle_timeout.cxx"
+    "${LIBRARY_DIR}/src/handle_append_entries.cxx"
+    "${LIBRARY_DIR}/src/cluster_config.cxx"
 )
 
 
@@ -37,9 +37,9 @@ else()
     target_compile_definitions(nuraft PRIVATE USE_BOOST_ASIO=1 BOOST_ASIO_STANDALONE=1)
 endif()
 
-target_include_directories (nuraft SYSTEM PRIVATE ${LIBRARY_DIR}/include/libnuraft)
+target_include_directories (nuraft SYSTEM PRIVATE "${LIBRARY_DIR}/include/libnuraft")
 # for some reason include "asio.h" directly without "boost/" prefix.
-target_include_directories (nuraft SYSTEM PRIVATE ${ClickHouse_SOURCE_DIR}/contrib/boost/boost)
+target_include_directories (nuraft SYSTEM PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/boost/boost")
 
 target_link_libraries (nuraft PRIVATE boost::headers_only boost::coroutine)
 
@@ -47,4 +47,4 @@ if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
     target_link_libraries (nuraft PRIVATE ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
 endif()
 
-target_include_directories (nuraft SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories (nuraft SYSTEM PUBLIC "${LIBRARY_DIR}/include")

contrib/openldap-cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(OPENLDAP_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/openldap)
+set(OPENLDAP_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
 
 # How these lists were generated?
 # I compiled the original OpenLDAP with it's original build system and copied the list of source files from build commands.
@@ -12,9 +12,9 @@ set(OPENLDAP_VERSION_STRING "2.5.X")
 
 macro(mkversion _lib_name)
     add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c
-        COMMAND ${CMAKE_COMMAND} -E env bash -c "${OPENLDAP_SOURCE_DIR}/build/mkversion -v '${OPENLDAP_VERSION_STRING}' liblber.la > ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c"
-        MAIN_DEPENDENCY ${OPENLDAP_SOURCE_DIR}/build/mkversion
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c"
+        COMMAND ${CMAKE_COMMAND} -E env bash -c "${OPENLDAP_SOURCE_DIR}/build/mkversion -v '${OPENLDAP_VERSION_STRING}' liblber.la > \"${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c\""
+        MAIN_DEPENDENCY "${OPENLDAP_SOURCE_DIR}/build/mkversion"
         WORKING_DIRECTORY ${OPENLDAP_SOURCE_DIR}
         VERBATIM
     )
@@ -37,23 +37,23 @@ endif()
 set(_extra_build_dir "${CMAKE_CURRENT_SOURCE_DIR}/${_system_name}_${_system_processor}")
 
 set(_lber_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/assert.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/decode.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/encode.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/io.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/bprint.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/debug.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/memory.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/options.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/sockbuf.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/stdio.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/assert.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/decode.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/encode.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/io.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/bprint.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/debug.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/memory.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/options.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/sockbuf.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/stdio.c"
 )
 
 mkversion(lber)
 
 add_library(lber ${_libs_type}
     ${_lber_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/lber-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/lber-version.c"
 )
 
 target_link_libraries(lber
@@ -62,8 +62,8 @@ target_link_libraries(lber
 
 target_include_directories(lber
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/liblber
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/liblber"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 
@@ -72,78 +72,78 @@ target_compile_definitions(lber
 )
 
 set(_ldap_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c"
 )
 
 mkversion(ldap)
 
 add_library(ldap ${_libs_type}
     ${_ldap_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/ldap-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/ldap-version.c"
 )
 
 target_link_libraries(ldap
@@ -153,8 +153,8 @@ target_link_libraries(ldap
 
 target_include_directories(ldap
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 
@@ -163,16 +163,16 @@ target_compile_definitions(ldap
 )
 
 set(_ldap_r_specific_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/threads.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rdwr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/tpool.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rq.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_posix.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_thr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_nt.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_pth.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_stub.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_debug.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/threads.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rdwr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/tpool.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rq.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_posix.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_thr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_nt.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_pth.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_stub.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_debug.c"
 )
 
 mkversion(ldap_r)
@@ -180,7 +180,7 @@ mkversion(ldap_r)
 add_library(ldap_r ${_libs_type}
     ${_ldap_r_specific_srcs}
     ${_ldap_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c"
 )
 
 target_link_libraries(ldap_r
@@ -190,9 +190,9 @@ target_link_libraries(ldap_r
 
 target_include_directories(ldap_r
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 

contrib/poco

@@ -1 +1 @@
-Subproject commit b7d9ec16ee33ca76643d5fcd907ea9a33285640a
+Subproject commit 5994506908028612869fee627d68d8212dfe7c1e

contrib/poco-cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/poco)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco")
 
 add_subdirectory (Crypto)
 add_subdirectory (Data)

contrib/poco-cmake/Crypto/CMakeLists.txt

@@ -1,35 +1,35 @@
 if (ENABLE_SSL)
     if (USE_INTERNAL_POCO_LIBRARY)
         set (SRCS
-            ${LIBRARY_DIR}/Crypto/src/Cipher.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherFactory.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoException.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoStream.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoTransform.cpp
-            ${LIBRARY_DIR}/Crypto/src/DigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECDSADigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/EVPPKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/KeyPair.cpp
-            ${LIBRARY_DIR}/Crypto/src/KeyPairImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/OpenSSLInitializer.cpp
-            ${LIBRARY_DIR}/Crypto/src/PKCS12Container.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSACipherImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSADigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSAKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSAKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/X509Certificate.cpp
+            "${LIBRARY_DIR}/Crypto/src/Cipher.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherFactory.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoException.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoStream.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoTransform.cpp"
+            "${LIBRARY_DIR}/Crypto/src/DigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECDSADigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/EVPPKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/KeyPair.cpp"
+            "${LIBRARY_DIR}/Crypto/src/KeyPairImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/OpenSSLInitializer.cpp"
+            "${LIBRARY_DIR}/Crypto/src/PKCS12Container.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSACipherImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSADigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSAKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSAKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/X509Certificate.cpp"
         )
 
         add_library (_poco_crypto ${SRCS})
         add_library (Poco::Crypto ALIAS _poco_crypto)
 
         target_compile_options (_poco_crypto PRIVATE -Wno-newline-eof)
-        target_include_directories (_poco_crypto SYSTEM PUBLIC ${LIBRARY_DIR}/Crypto/include)
+        target_include_directories (_poco_crypto SYSTEM PUBLIC "${LIBRARY_DIR}/Crypto/include")
         target_link_libraries (_poco_crypto PUBLIC Poco::Foundation ssl crypto)
     else ()
         add_library (Poco::Crypto UNKNOWN IMPORTED GLOBAL)

contrib/poco-cmake/Data/CMakeLists.txt

@@ -1,40 +1,40 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/Data/src/AbstractBinder.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractBinding.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractExtraction.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractExtractor.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractPreparation.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractPreparator.cpp
-        ${LIBRARY_DIR}/Data/src/ArchiveStrategy.cpp
-        ${LIBRARY_DIR}/Data/src/Bulk.cpp
-        ${LIBRARY_DIR}/Data/src/Connector.cpp
-        ${LIBRARY_DIR}/Data/src/DataException.cpp
-        ${LIBRARY_DIR}/Data/src/Date.cpp
-        ${LIBRARY_DIR}/Data/src/DynamicLOB.cpp
-        ${LIBRARY_DIR}/Data/src/Limit.cpp
-        ${LIBRARY_DIR}/Data/src/MetaColumn.cpp
-        ${LIBRARY_DIR}/Data/src/PooledSessionHolder.cpp
-        ${LIBRARY_DIR}/Data/src/PooledSessionImpl.cpp
-        ${LIBRARY_DIR}/Data/src/Position.cpp
-        ${LIBRARY_DIR}/Data/src/Range.cpp
-        ${LIBRARY_DIR}/Data/src/RecordSet.cpp
-        ${LIBRARY_DIR}/Data/src/Row.cpp
-        ${LIBRARY_DIR}/Data/src/RowFilter.cpp
-        ${LIBRARY_DIR}/Data/src/RowFormatter.cpp
-        ${LIBRARY_DIR}/Data/src/RowIterator.cpp
-        ${LIBRARY_DIR}/Data/src/Session.cpp
-        ${LIBRARY_DIR}/Data/src/SessionFactory.cpp
-        ${LIBRARY_DIR}/Data/src/SessionImpl.cpp
-        ${LIBRARY_DIR}/Data/src/SessionPool.cpp
-        ${LIBRARY_DIR}/Data/src/SessionPoolContainer.cpp
-        ${LIBRARY_DIR}/Data/src/SimpleRowFormatter.cpp
-        ${LIBRARY_DIR}/Data/src/SQLChannel.cpp
-        ${LIBRARY_DIR}/Data/src/Statement.cpp
-        ${LIBRARY_DIR}/Data/src/StatementCreator.cpp
-        ${LIBRARY_DIR}/Data/src/StatementImpl.cpp
-        ${LIBRARY_DIR}/Data/src/Time.cpp
-        ${LIBRARY_DIR}/Data/src/Transaction.cpp
+        "${LIBRARY_DIR}/Data/src/AbstractBinder.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractBinding.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractExtraction.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractExtractor.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractPreparation.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractPreparator.cpp"
+        "${LIBRARY_DIR}/Data/src/ArchiveStrategy.cpp"
+        "${LIBRARY_DIR}/Data/src/Bulk.cpp"
+        "${LIBRARY_DIR}/Data/src/Connector.cpp"
+        "${LIBRARY_DIR}/Data/src/DataException.cpp"
+        "${LIBRARY_DIR}/Data/src/Date.cpp"
+        "${LIBRARY_DIR}/Data/src/DynamicLOB.cpp"
+        "${LIBRARY_DIR}/Data/src/Limit.cpp"
+        "${LIBRARY_DIR}/Data/src/MetaColumn.cpp"
+        "${LIBRARY_DIR}/Data/src/PooledSessionHolder.cpp"
+        "${LIBRARY_DIR}/Data/src/PooledSessionImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/Position.cpp"
+        "${LIBRARY_DIR}/Data/src/Range.cpp"
+        "${LIBRARY_DIR}/Data/src/RecordSet.cpp"
+        "${LIBRARY_DIR}/Data/src/Row.cpp"
+        "${LIBRARY_DIR}/Data/src/RowFilter.cpp"
+        "${LIBRARY_DIR}/Data/src/RowFormatter.cpp"
+        "${LIBRARY_DIR}/Data/src/RowIterator.cpp"
+        "${LIBRARY_DIR}/Data/src/Session.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionFactory.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionPool.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionPoolContainer.cpp"
+        "${LIBRARY_DIR}/Data/src/SimpleRowFormatter.cpp"
+        "${LIBRARY_DIR}/Data/src/SQLChannel.cpp"
+        "${LIBRARY_DIR}/Data/src/Statement.cpp"
+        "${LIBRARY_DIR}/Data/src/StatementCreator.cpp"
+        "${LIBRARY_DIR}/Data/src/StatementImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/Time.cpp"
+        "${LIBRARY_DIR}/Data/src/Transaction.cpp"
     )
 
     add_library (_poco_data ${SRCS})
@@ -43,7 +43,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
     if (COMPILER_GCC)
         target_compile_options (_poco_data PRIVATE -Wno-deprecated-copy)
     endif ()
-    target_include_directories (_poco_data SYSTEM PUBLIC ${LIBRARY_DIR}/Data/include)
+    target_include_directories (_poco_data SYSTEM PUBLIC "${LIBRARY_DIR}/Data/include")
     target_link_libraries (_poco_data PUBLIC Poco::Foundation)
 else ()
     # NOTE: don't know why, but the GLOBAL is required here.

contrib/poco-cmake/Data/ODBC/CMakeLists.txt

@@ -5,27 +5,27 @@ if (ENABLE_ODBC)
 
     if (USE_INTERNAL_POCO_LIBRARY)
         set (SRCS
-            ${LIBRARY_DIR}/Data/ODBC/src/Binder.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ConnectionHandle.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Connector.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/EnvironmentHandle.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Extractor.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCException.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCMetaColumn.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCStatementImpl.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Parameter.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Preparator.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/SessionImpl.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/TypeInfo.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Unicode.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Utility.cpp
+            "${LIBRARY_DIR}/Data/ODBC/src/Binder.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ConnectionHandle.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Connector.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/EnvironmentHandle.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Extractor.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCException.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCMetaColumn.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCStatementImpl.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Parameter.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Preparator.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/SessionImpl.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/TypeInfo.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Unicode.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Utility.cpp"
         )
 
         add_library (_poco_data_odbc ${SRCS})
         add_library (Poco::Data::ODBC ALIAS _poco_data_odbc)
 
         target_compile_options (_poco_data_odbc PRIVATE -Wno-unused-variable)
-        target_include_directories (_poco_data_odbc SYSTEM PUBLIC ${LIBRARY_DIR}/Data/ODBC/include)
+        target_include_directories (_poco_data_odbc SYSTEM PUBLIC "${LIBRARY_DIR}/Data/ODBC/include")
         target_link_libraries (_poco_data_odbc PUBLIC Poco::Data unixodbc)
     else ()
         add_library (Poco::Data::ODBC UNKNOWN IMPORTED GLOBAL)