diff --git a/.gitmodules b/.gitmodules index a618104f364..b6c5a26f105 100644 --- a/.gitmodules +++ b/.gitmodules @@ -369,3 +369,6 @@ [submodule "contrib/idna"] path = contrib/idna url = https://github.com/ada-url/idna.git +[submodule "contrib/expected"] + path = contrib/expected + url = https://github.com/TartanLlama/expected diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index c6d1dcb41e6..e780d6e6ae3 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -222,6 +222,7 @@ else () endif () add_contrib (xxHash-cmake xxHash) +add_contrib (expected-cmake expected) add_contrib (libbcrypt-cmake libbcrypt) diff --git a/contrib/expected b/contrib/expected new file mode 160000 index 00000000000..3f0ca7b1925 --- /dev/null +++ b/contrib/expected @@ -0,0 +1 @@ +Subproject commit 3f0ca7b19253129700a073abfa6d8638d9f7c80c diff --git a/contrib/expected-cmake/CMakeLists.txt b/contrib/expected-cmake/CMakeLists.txt new file mode 100644 index 00000000000..4ea77f28d62 --- /dev/null +++ b/contrib/expected-cmake/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(expected INTERFACE) +target_include_directories(expected SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/expected/include") +add_library(ch_contrib::expected ALIAS expected) diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt index 733ae25274e..11bcc948288 100644 --- a/src/Functions/CMakeLists.txt +++ b/src/Functions/CMakeLists.txt @@ -46,6 +46,7 @@ list (APPEND PUBLIC_LIBS list (APPEND PRIVATE_LIBS ch_contrib::zlib + ch_contrib::expected boost::filesystem divide_impl ch_contrib::xxHash diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp index 7a0d7c75774..31e1162bccc 100644 --- a/src/Functions/parseDateTime.cpp +++ b/src/Functions/parseDateTime.cpp @@ -16,6 +16,7 @@ #include #include +#include namespace DB {