From 1fa413e03f7c2cd462e6643edb8347fed34c1db1 Mon Sep 17 00:00:00 2001 From: s-kat Date: Fri, 28 May 2021 14:19:44 +0300 Subject: [PATCH] Try to build --- .gitmodules | 4 ++-- CMakeLists.txt | 2 +- cmake/find/cld2.cmake | 3 +++ src/CMakeLists.txt | 2 +- src/Functions/.ya.make.swo | Bin 28672 -> 0 bytes src/Functions/CMakeLists.txt | 2 ++ 6 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 cmake/find/cld2.cmake delete mode 100644 src/Functions/.ya.make.swo diff --git a/.gitmodules b/.gitmodules index ec8788587a0..11ed2298e36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -232,5 +232,5 @@ path = contrib/yaml-cpp url = https://github.com/ClickHouse-Extras/yaml-cpp.git [submodule "contrib/cld2"] - path = contrib/cld2 - url = https://github.com/CLD2Owners/cld2.git + path = contrib/cld2 + url = git@github.com:CLD2Owners/cld2.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c62748ff95..556aae7567f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -527,7 +527,7 @@ include (cmake/find/rocksdb.cmake) include (cmake/find/libpqxx.cmake) include (cmake/find/nuraft.cmake) include (cmake/find/yaml-cpp.cmake) - +include (cmake/find/cld2.cmake) if(NOT USE_INTERNAL_PARQUET_LIBRARY) set (ENABLE_ORC OFF CACHE INTERNAL "") diff --git a/cmake/find/cld2.cmake b/cmake/find/cld2.cmake new file mode 100644 index 00000000000..d725dc8d2e3 --- /dev/null +++ b/cmake/find/cld2.cmake @@ -0,0 +1,3 @@ +if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cld2") + message (ERROR "submodule contrib/cld2 is missing. to fix try run: \n git submodule update --init --recursive") +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 759f625de89..de866d8d0f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -350,7 +350,7 @@ dbms_target_link_libraries ( clickhouse_dictionaries_embedded clickhouse_parsers lz4 - cld2 + # cld2 Poco::JSON Poco::MongoDB string_utils diff --git a/src/Functions/.ya.make.swo b/src/Functions/.ya.make.swo deleted file mode 100644 index 2fcf8f5136d5b7deec8fb55322db2da39d12ff79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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