hanzoai/datastore
2
0
Fork 0
mirror of https://github.com/hanzoai/datastore.git synced 2026-09-26 13:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

datastore rebrand fix: ${ClickHouse_SOURCE_DIR} -> ${Datastore_SOURCE_DIR} (project var)

Browse Source 
project(Datastore) renamed the CMake auto-vars ClickHouse_SOURCE_DIR/BINARY_DIR; the contrib
*-cmake glue + top-level CMakeLists submodule check still referenced the old names -> undefined ->
false 'submodules not initialized'. Renamed all CMake refs (incl contrib glue). Found by spark build.
This commit is contained in:
zooqueen
2026-06-21 21:03:07 -07:00
parent 06f45b6529
commit 7306e24eea
118 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -55,7 +55,7 @@ set(CMAKE_LINK_DEPENDS_NO_SHARED 1) # Do not relink all depended targets on .so
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Check that submodules are present
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sysroot/README.md")
if (NOT EXISTS "${Datastore_SOURCE_DIR}/contrib/sysroot/README.md")
message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init")
endif ()
contrib/FP16-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (FP16_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/FP16/")
set (FP16_PROJECT_DIR "${Datastore_SOURCE_DIR}/contrib/FP16/")
add_library(_fp16 INTERFACE)
target_include_directories(_fp16 SYSTEM INTERFACE ${FP16_PROJECT_DIR}/include)
contrib/SimSIMD-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
# See contrib/usearch-cmake/CMakeLists.txt, why only enabled on x86 and ARM
if (ARCH_AMD64 OR (ARCH_AARCH64 AND NOT NO_ARMV81_OR_HIGHER AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19))
set(SIMSIMD_PROJECT_DIR "${ClickHouse_SOURCE_DIR}/contrib/SimSIMD")
set(SIMSIMD_PROJECT_DIR "${Datastore_SOURCE_DIR}/contrib/SimSIMD")
set(SIMSIMD_SRCS ${SIMSIMD_PROJECT_DIR}/c/lib.c)
add_library(_simsimd ${SIMSIMD_SRCS})
target_include_directories(_simsimd SYSTEM PUBLIC "${SIMSIMD_PROJECT_DIR}/include")
contrib/StringZilla-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(STRINGZILLA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/StringZilla")
set(STRINGZILLA_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/StringZilla")
SET(STRINGZILLA_SOURCES
"${STRINGZILLA_SOURCE_DIR}/c/compare.c"
contrib/abseil-cpp-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
set(ABSL_ROOT_DIR "${Datastore_SOURCE_DIR}/contrib/abseil-cpp")
set(ABSL_COMMON_INCLUDE_DIRS "${ABSL_ROOT_DIR}")
set(CMAKE_CXX_STANDARD 17)
contrib/ai-sdk-cpp-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_CLIENT_AI)
return()
endif()
set(AI_SDK_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/ai-sdk-cpp")
set(AI_SDK_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/ai-sdk-cpp")
set(AI_SDK_THIRD_PARTY_DIR "${AI_SDK_SOURCE_DIR}/third_party")
# Core library sources
contrib/amqpcpp-cmake/CMakeLists.txt
+1 -1
View File
@@ -16,7 +16,7 @@ if (NOT TARGET ch_contrib::uv)
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/AMQP-CPP")
set (SRCS
"${LIBRARY_DIR}/src/array.cpp"
contrib/antlr4-cpp-runtime-cmake/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,7 @@ if(NOT ENABLE_ANTLR4_CPP_RUNTIME)
return()
endif()
set(_ANTLR4_CPP_RUNTIME_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/antlr4-cpp-runtime/runtime/Cpp")
set(_ANTLR4_CPP_RUNTIME_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/antlr4-cpp-runtime/runtime/Cpp")
file(GLOB _ANTLR4_CPP_RUNTIME_SRC
"${_ANTLR4_CPP_RUNTIME_SOURCE_DIR}/runtime/src/*.cpp"
contrib/antlr4-grammars-cmake/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,7 @@ if(NOT ENABLE_ANTLR4_GRAMMARS)
return()
endif()
set(_ANTLR4_GRAMMARS_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/antlr4-grammars-cmake/generated")
set(_ANTLR4_GRAMMARS_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/antlr4-grammars-cmake/generated")
set(_ANTLR4_GRAMMARS_SOURCE_DIR "${_ANTLR4_GRAMMARS_INCLUDE_DIR}/antlr4_grammars")
file(GLOB _ANTLR4_GRAMMARS_SRC "${_ANTLR4_GRAMMARS_SOURCE_DIR}/*.h" "${_ANTLR4_GRAMMARS_SOURCE_DIR}/*.cpp")
contrib/arrow-cmake/CMakeLists.txt
+13 -13
View File
@@ -58,7 +58,7 @@ endif()
# === orc
set(ORC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/orc/c++")
set(ORC_SOURCE_DIR "${Datastore_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")
@@ -67,7 +67,7 @@ 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_ADDITION_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(ARROW_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")
set(ARROW_SRC_DIR "${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src")
if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME OR NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
set(PROTOBUF_EXECUTABLE "${PROJECT_BINARY_DIR}/native/contrib/google-protobuf-cmake/protoc")
@@ -85,8 +85,8 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
"${PROTO_DIR}/orc_proto.proto")
# === flatbuffers
set(FLATBUFFERS_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/flatbuffers")
set(FLATBUFFERS_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/flatbuffers")
set(FLATBUFFERS_SRC_DIR "${Datastore_SOURCE_DIR}/contrib/flatbuffers")
set(FLATBUFFERS_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/flatbuffers")
set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_SRC_DIR}/include")
set(FLATBUFFERS_SRCS
@@ -102,7 +102,7 @@ target_compile_definitions(_flatbuffers PRIVATE -DFLATBUFFERS_LOCALE_INDEPENDENT
# === hdfs
# NOTE: cannot use ch_contrib::hdfs since it's INCLUDE_DIRECTORIES does not includes trailing "hdfs/"
set(HDFS_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/")
set(HDFS_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/")
# arrow-cmake cmake file calling orc cmake subroutine which detects certain compiler features.
# Apple Clang compiler failed to compile this code without specifying c++11 standard.
@@ -212,9 +212,9 @@ target_link_libraries(_orc PRIVATE
ch_contrib::zstd)
target_include_directories(_orc SYSTEM BEFORE PUBLIC
${ORC_INCLUDE_DIR}
"${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src/orc/c++/include")
"${Datastore_SOURCE_DIR}/contrib/arrow-cmake/cpp/src/orc/c++/include")
target_compile_options(_orc PRIVATE
-include "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src/google/protobuf/stubs/port.h"
-include "${Datastore_SOURCE_DIR}/contrib/google-protobuf/src/google/protobuf/stubs/port.h"
)
target_include_directories(_orc SYSTEM BEFORE PUBLIC ${ORC_BUILD_INCLUDE_DIR})
target_include_directories(_orc SYSTEM PRIVATE
@@ -226,7 +226,7 @@ target_include_directories(_orc SYSTEM PRIVATE
# === arrow
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
set(ARROW_GENERATED_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/cpp/src)
configure_file("${LIBRARY_DIR}/util/config.h.cmake" "${ARROW_GENERATED_SRC_DIR}/arrow/util/config.h" ESCAPE_QUOTES)
@@ -506,7 +506,7 @@ target_link_libraries(_arrow PUBLIC _orc)
add_dependencies(_arrow protoc)
target_include_directories(_arrow SYSTEM BEFORE PUBLIC ${ARROW_SRC_DIR})
target_include_directories(_arrow SYSTEM BEFORE PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src")
target_include_directories(_arrow SYSTEM BEFORE PUBLIC "${Datastore_SOURCE_DIR}/contrib/arrow-cmake/cpp/src")
target_include_directories(_arrow SYSTEM PRIVATE ${HDFS_INCLUDE_DIR})
@@ -516,8 +516,8 @@ include(flight.cmake)
# === 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 "${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src/parquet")
set(GEN_LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src/generated")
# arrow/cpp/src/parquet/CMakeLists.txt
set(PARQUET_SRCS
"${LIBRARY_DIR}/arrow/fuzz_internal.cc"
@@ -583,7 +583,7 @@ add_library(_parquet ${PARQUET_SRCS})
add_library(ch_contrib::parquet ALIAS _parquet)
target_include_directories(_parquet SYSTEM BEFORE
PUBLIC
"${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src"
"${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src"
"${CMAKE_CURRENT_SOURCE_DIR}/cpp/src")
target_link_libraries(_parquet
PUBLIC
@@ -609,7 +609,7 @@ add_definitions(-DARROW_ENABLE_THREADING)
# === tools
set(TOOLS_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet")
set(TOOLS_DIR "${Datastore_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")
contrib/arrow-cmake/flight.cmake
+5 -5
View File
@@ -11,15 +11,15 @@ if(NOT ENABLE_GRPC)
return()
endif()
set(GRPC_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/grpc/include)
set(GRPC_INCLUDE_DIR ${Datastore_SOURCE_DIR}/contrib/grpc/include)
set(ARROW_FLIGHT_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow/flight)
set(ARROW_FLIGHT_SQL_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow/flight/sql)
set(ARROW_FLIGHT_PROTO_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/format)
set(ARROW_FLIGHT_SRC_DIR ${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src/arrow/flight)
set(ARROW_FLIGHT_SQL_SRC_DIR ${Datastore_SOURCE_DIR}/contrib/arrow/cpp/src/arrow/flight/sql)
set(ARROW_FLIGHT_PROTO_DIR ${Datastore_SOURCE_DIR}/contrib/arrow/format)
set(ARROW_FLIGHT_GENERATED_SRC_DIR ${ARROW_GENERATED_SRC_DIR}/arrow/flight)
set(ARROW_FLIGHT_SQL_GENERATED_SRC_DIR ${ARROW_GENERATED_SRC_DIR}/arrow/flight/sql)
set(PROTOBUF_IMPORT_DIRS ${ARROW_FLIGHT_PROTO_DIR} ${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src)
set(PROTOBUF_IMPORT_DIRS ${ARROW_FLIGHT_PROTO_DIR} ${Datastore_SOURCE_DIR}/contrib/google-protobuf/src)
PROTOBUF_GENERATE_GRPC_CPP(
flight_sources
contrib/aws-cmake/CMakeLists.txt
+19 -19
View File
@@ -21,13 +21,13 @@ endif()
# Utilities.
include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsFeatureTests.cmake")
include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsThreadAffinity.cmake")
include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsThreadName.cmake")
include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsSIMD.cmake")
include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsGetVersion.cmake")
include("${Datastore_SOURCE_DIR}/contrib/aws-cmake/AwsFeatureTests.cmake")
include("${Datastore_SOURCE_DIR}/contrib/aws-cmake/AwsThreadAffinity.cmake")
include("${Datastore_SOURCE_DIR}/contrib/aws-cmake/AwsThreadName.cmake")
include("${Datastore_SOURCE_DIR}/contrib/aws-cmake/AwsSIMD.cmake")
include("${Datastore_SOURCE_DIR}/contrib/aws-cmake/AwsGetVersion.cmake")
set (AWS_STUBS "${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/aws_stubs.cpp")
set (AWS_STUBS "${Datastore_SOURCE_DIR}/contrib/aws-cmake/aws_stubs.cpp")
# Gather sources and options.
@@ -57,24 +57,24 @@ endif()
# Directories.
SET(AWS_SDK_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws")
SET(AWS_SDK_DIR "${Datastore_SOURCE_DIR}/contrib/aws")
SET(AWS_SDK_CORE_DIR "${AWS_SDK_DIR}/src/aws-cpp-sdk-core")
SET(AWS_SDK_S3_DIR "${AWS_SDK_DIR}/generated/src/aws-cpp-sdk-s3")
SET(AWS_SDK_KMS_DIR "${AWS_SDK_DIR}/generated/src/aws-cpp-sdk-kms")
SET(AWS_SDK_GLUE_DIR "${AWS_SDK_DIR}/generated/src/aws-cpp-sdk-glue")
SET(AWS_AUTH_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-auth")
SET(AWS_CAL_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-cal")
SET(AWS_CHECKSUMS_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-checksums")
SET(AWS_COMMON_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-common")
SET(AWS_COMPRESSION_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-compression")
SET(AWS_CRT_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-crt-cpp")
SET(AWS_EVENT_STREAM_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-event-stream")
SET(AWS_HTTP_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-http")
SET(AWS_IO_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-io")
SET(AWS_MQTT_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-mqtt")
SET(AWS_S3_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-s3")
SET(AWS_SDKUTILS_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-sdkutils")
SET(AWS_AUTH_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-auth")
SET(AWS_CAL_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-cal")
SET(AWS_CHECKSUMS_DIR "${Datastore_SOURCE_DIR}/contrib/aws-checksums")
SET(AWS_COMMON_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-common")
SET(AWS_COMPRESSION_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-compression")
SET(AWS_CRT_DIR "${Datastore_SOURCE_DIR}/contrib/aws-crt-cpp")
SET(AWS_EVENT_STREAM_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-event-stream")
SET(AWS_HTTP_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-http")
SET(AWS_IO_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-io")
SET(AWS_MQTT_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-mqtt")
SET(AWS_S3_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-s3")
SET(AWS_SDKUTILS_DIR "${Datastore_SOURCE_DIR}/contrib/aws-c-sdkutils")
# aws-cpp-sdk-core
contrib/azure-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_AZURE_BLOB_STORAGE OR OS_FREEBSD)
return()
endif()
set(AZURE_DIR "${ClickHouse_SOURCE_DIR}/contrib/azure")
set(AZURE_DIR "${Datastore_SOURCE_DIR}/contrib/azure")
set(AZURE_SDK_LIBRARY_DIR "${AZURE_DIR}/sdk")
file(GLOB AZURE_SDK_SRC
contrib/base64-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_BASE64)
return()
endif()
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
SET(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/base64")
if (ARCH_AMD64)
# These defines enable/disable SIMD codecs in base64's runtime codec dispatch.
contrib/boost-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/boost")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/boost")
# filesystem
contrib/brotli-cmake/CMakeLists.txt
+2 -2
View File
@@ -5,8 +5,8 @@ if (NOT ENABLE_BROTLI)
return()
endif()
set(BROTLI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/brotli/c")
set(BROTLI_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/brotli/c")
set(BROTLI_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/brotli/c")
set(BROTLI_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/brotli/c")
set(SRCS
"${BROTLI_SOURCE_DIR}/enc/command.c"
contrib/bzip2-cmake/CMakeLists.txt
+2 -2
View File
@@ -4,8 +4,8 @@ if (NOT ENABLE_BZIP2)
return()
endif()
set(BZIP2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/bzip2")
set(BZIP2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/bzip2")
set(BZIP2_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/bzip2")
set(BZIP2_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/bzip2")
set(SRCS
"${BZIP2_SOURCE_DIR}/blocksort.c"
contrib/c-ares-cmake/CMakeLists.txt
+5 -5
View File
@@ -1,4 +1,4 @@
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/c-ares")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/c-ares")
# Generated from contrib/c-ares/src/lib/Makefile.inc
SET(SRCS
@@ -105,15 +105,15 @@ target_include_directories(_c-ares SYSTEM PUBLIC
# platform-specific folder.
# For the platform-specific compile definitions, see c-ares top-level CMakeLists.txt.
if (OS_LINUX)
target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/linux")
target_include_directories(_c-ares SYSTEM PUBLIC "${Datastore_SOURCE_DIR}/contrib/c-ares-cmake/linux")
target_compile_definitions(_c-ares PRIVATE -D_GNU_SOURCE -D_POSIX_C_SOURCE=199309L -D_XOPEN_SOURCE=600)
elseif (OS_DARWIN)
target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/darwin")
target_include_directories(_c-ares SYSTEM PUBLIC "${Datastore_SOURCE_DIR}/contrib/c-ares-cmake/darwin")
target_compile_definitions(_c-ares PRIVATE -D_DARWIN_C_SOURCE)
elseif (OS_FREEBSD)
target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/freebsd")
target_include_directories(_c-ares SYSTEM PUBLIC "${Datastore_SOURCE_DIR}/contrib/c-ares-cmake/freebsd")
elseif (OS_SUNOS)
target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/solaris")
target_include_directories(_c-ares SYSTEM PUBLIC "${Datastore_SOURCE_DIR}/contrib/c-ares-cmake/solaris")
endif()
add_library(ch_contrib::c-ares ALIAS _c-ares)
contrib/capnproto-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_CAPNP)
return()
endif()
set (CAPNPROTO_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src")
set (CAPNPROTO_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/capnproto/c++/src")
set (CMAKE_CXX_STANDARD 17)
contrib/cctz-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cctz")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/cctz")
set (SRCS
"${LIBRARY_DIR}/src/civil_time_detail.cc"
contrib/cld2-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cld2")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/cld2")
set (SRCS
"${LIBRARY_DIR}/internal/cldutil.cc"
contrib/clickstack-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(CLICKSTACK_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/clickstack/out")
set(CLICKSTACK_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/clickstack/out")
# Set clickstack directory for gzipped files in build directory
set(CLICKSTACK_DIR "${CMAKE_CURRENT_BINARY_DIR}/clickstack_compressed")
contrib/compiler-rt-cmake/CMakeLists.txt
+3 -3
View File
@@ -12,7 +12,7 @@
# * clang_rt_ubsan_standalone / ubsan_standalone_cxx — if SANITIZE = undefined
# * clang_rt_xray — if ENABLE_XRAY
set(COMPILER_RT_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt")
set(COMPILER_RT_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/compiler-rt")
set(BUILTINS_SOURCE_DIR "${COMPILER_RT_DIR}/lib/builtins")
set(SANCOMMON_DIR "${COMPILER_RT_DIR}/lib/sanitizer_common")
set(INTERCEPTION_DIR "${COMPILER_RT_DIR}/lib/interception")
@@ -202,7 +202,7 @@ _prepend_dir(BUILTINS_SOURCES "${BUILTINS_SOURCE_DIR}" ${BUILTINS_ARCH_SOURCES})
add_library(clang_rt_builtins STATIC ${BUILTINS_SOURCES})
target_include_directories(clang_rt_builtins PRIVATE
"${BUILTINS_SOURCE_DIR}"
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
"${Datastore_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
)
target_compile_options(clang_rt_builtins PRIVATE
# These flags mirror BUILTIN_CFLAGS in
@@ -264,7 +264,7 @@ include(sources/xray.cmake)
set(SANITIZER_INCLUDE_DIRS
"${COMPILER_RT_DIR}/lib"
"${COMPILER_RT_DIR}/include"
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
"${Datastore_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
)
# Per-CFG flags shared by every sanitizer/XRay component.
contrib/corrosion-cmake/CMakeLists.txt
+3 -3
View File
@@ -29,7 +29,7 @@ macro(set_rust_target)
endif ()
# FindRust.cmake
set(RUST_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake")
set(RUST_MODULE_PATH "${Datastore_SOURCE_DIR}/contrib/corrosion/cmake")
if (NOT "${RUST_MODULE_PATH}" IN_LIST "${CMAKE_MODULE_PATH}")
list (APPEND CMAKE_MODULE_PATH "${RUST_MODULE_PATH}")
endif()
@@ -72,9 +72,9 @@ endif()
set_rust_target()
# Define function corrosion_import_crate()
include ("${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake")
include ("${Datastore_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake")
set(CXX_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxx/include")
set(CXX_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libcxx/include")
if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
set(RUST_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
contrib/cppkafka-cmake/CMakeLists.txt
+1 -1
View File
@@ -3,7 +3,7 @@ if (NOT ENABLE_KAFKA)
return()
endif()
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cppkafka")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/cppkafka")
set(SRCS
"${LIBRARY_DIR}/src/buffer.cpp"
contrib/crc32-s390x-cmake/CMakeLists.txt
+2 -2
View File
@@ -6,8 +6,8 @@ if (NOT ENABLE_CRC32_S390X)
return()
endif()
set(CRC32_S390X_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/crc32-s390x)
set(CRC32_S390X_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/crc32-s390x)
set(CRC32_S390X_SOURCE_DIR ${Datastore_SOURCE_DIR}/contrib/crc32-s390x)
set(CRC32_S390X_INCLUDE_DIR ${Datastore_SOURCE_DIR}/contrib/crc32-s390x)
set(CRC32_SRCS
"${CRC32_S390X_SOURCE_DIR}/crc32-s390x.c"
contrib/crc32-vpmsum-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ARCH_PPC64LE)
return()
endif()
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/crc32-vpmsum")
SET(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/crc32-vpmsum")
add_library(_crc32-vpmsum
"${LIBRARY_DIR}/vec_crc32.c"
contrib/crc32c-cmake/CMakeLists.txt
+2 -2
View File
@@ -1,5 +1,5 @@
set(CRC32C_DIR ${ClickHouse_SOURCE_DIR}/contrib/crc32c)
set(CRC32C_CMAKE_DIR ${ClickHouse_SOURCE_DIR}/contrib/crc32c-cmake)
set(CRC32C_DIR ${Datastore_SOURCE_DIR}/contrib/crc32c)
set(CRC32C_CMAKE_DIR ${Datastore_SOURCE_DIR}/contrib/crc32c-cmake)
include_directories("${PROJECT_BINARY_DIR}/include")
contrib/croaring-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/croaring")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/croaring")
set(SRCS
"${LIBRARY_DIR}/src/array_util.c"
contrib/curl-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_CURL)
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/curl")
set (SRCS
"${LIBRARY_DIR}/lib/altsvc.c"
contrib/cyrus-sasl-cmake/CMakeLists.txt
+1 -1
View File
@@ -10,7 +10,7 @@ if (NOT ENABLE_CYRUS_SASL)
return()
endif()
set(CYRUS_SASL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl")
set(CYRUS_SASL_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/cyrus-sasl")
add_library(_sasl2)
contrib/datasketches-cpp-cmake/CMakeLists.txt
+3 -3
View File
@@ -8,8 +8,8 @@ endif()
set(DATASKETCHES_LIBRARY theta)
add_library(_datasketches INTERFACE)
target_include_directories(_datasketches SYSTEM BEFORE INTERFACE
"${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/common/include"
"${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/count/include"
"${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/theta/include")
"${Datastore_SOURCE_DIR}/contrib/datasketches-cpp/common/include"
"${Datastore_SOURCE_DIR}/contrib/datasketches-cpp/count/include"
"${Datastore_SOURCE_DIR}/contrib/datasketches-cpp/theta/include")
add_library(ch_contrib::datasketches ALIAS _datasketches)
contrib/delta-kernel-rs-cmake/CMakeLists.txt
+2 -2
View File
@@ -1,6 +1,6 @@
set(DELTA_KERNEL_RS_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/delta-kernel-rs")
set(DELTA_KERNEL_RS_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/delta-kernel-rs")
set(DELTA_KERNEL_RS_BINARY_DIR "${CMAKE_BINARY_DIR}/contrib/delta-kernel-rs")
set(DELTA_KERNEL_RS_CMAKE_DIR "${ClickHouse_SOURCE_DIR}/contrib/delta-kernel-rs-cmake")
set(DELTA_KERNEL_RS_CMAKE_DIR "${Datastore_SOURCE_DIR}/contrib/delta-kernel-rs-cmake")
include(ExternalProject)
contrib/double-conversion-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion")
SET(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/double-conversion")
add_library(_double-conversion
"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc"
contrib/fast_float-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,3 +1,3 @@
add_library(_fast_float INTERFACE)
target_include_directories(_fast_float SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/fast_float/include/")
target_include_directories(_fast_float SYSTEM BEFORE INTERFACE "${Datastore_SOURCE_DIR}/contrib/fast_float/include/")
add_library(ch_contrib::fast_float ALIAS _fast_float)
contrib/fastops-cmake/CMakeLists.txt
+1 -1
View File
@@ -9,7 +9,7 @@ if(NOT ENABLE_FASTOPS)
return()
endif()
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/fastops")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/fastops")
set(SRCS "")
contrib/fmtlib-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(FMT_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/fmtlib")
set(FMT_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/fmtlib")
set (SRCS
# NOTE: do not build module for now:
contrib/google-benchmark-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-benchmark/src")
set (SRC_DIR "${Datastore_SOURCE_DIR}/contrib/google-benchmark/src")
set (SRCS
"${SRC_DIR}/benchmark.cc"
contrib/google-cloud-cpp-cmake/CMakeLists.txt
+4 -4
View File
@@ -25,9 +25,9 @@ set(GOOGLE_CLOUD_CPP_PRIVATE_INCLUDES)
set(GOOGLE_CLOUD_CPP_PRIVATE_LIBS)
# Directories.
SET(GOOGLE_CLOUD_CPP_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-cloud-cpp" )
SET(GOOGLE_CLOUD_CPP_DIR "${Datastore_SOURCE_DIR}/contrib/google-cloud-cpp" )
list(APPEND GOOGLE_CLOUD_CPP_PRIVATE_INCLUDES "${GOOGLE_CLOUD_CPP_DIR}")
list(APPEND CMAKE_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/google-cloud-cpp-cmake/cmake")
list(APPEND CMAKE_MODULE_PATH "${Datastore_SOURCE_DIR}/contrib/google-cloud-cpp-cmake/cmake")
# Set the PROJECT_SOURCE_DIR so that all Google Cloud cmake files work
set(PROJECT_SOURCE_DIR_BAK ${PROJECT_SOURCE_DIR})
@@ -42,7 +42,7 @@ include(GoogleCloudCppLibrary)
set(GOOGLE_CLOUD_CPP_ENABLE_GRPC ON)
set(PROJECT_VERSION "1")
set(PROJECT_VERSION_MAJOR "1")
set(PROTO_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src")
set(PROTO_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/google-protobuf/src")
if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME OR NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
set(Protobuf_PROTOC_EXECUTABLE "${PROJECT_BINARY_DIR}/native/contrib/google-protobuf-cmake/protoc")
@@ -89,7 +89,7 @@ include(google_cloud_cpp_storage)
# Common
list(APPEND GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES "${GOOGLE_CLOUD_CPP_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
set(GRPC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc")
set(GRPC_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/grpc")
list(APPEND GOOGLE_CLOUD_CPP_PUBLIC_INCLUDES "${GRPC_INCLUDE_DIR}/include" "${GRPC_INCLUDE_DIR}/spm-cpp-include")
# Restore the PROJECT_SOURCE_DIR.
contrib/google-cloud-cpp-cmake/cmake/GoogleApis.cmake
+1 -1
View File
@@ -167,7 +167,7 @@ set(PB_ARCHIVE "${PB_HASH}.tar.gz")
set(PB_DIR "googleapis-${PB_HASH}")
file(ARCHIVE_EXTRACT INPUT
"${ClickHouse_SOURCE_DIR}/contrib/google-cloud-cpp-cmake/googleapis/${PB_ARCHIVE}"
"${Datastore_SOURCE_DIR}/contrib/google-cloud-cpp-cmake/googleapis/${PB_ARCHIVE}"
DESTINATION
"${EXTERNAL_GOOGLEAPIS_PREFIX}/tmp")
contrib/google-protobuf-cmake/CMakeLists.txt
+4 -4
View File
@@ -8,7 +8,7 @@ endif()
# To avoid errors "'X' does not refer to a value" while using `offsetof` function.
set(CMAKE_CXX_STANDARD 17)
set(Protobuf_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src")
set(Protobuf_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/google-protobuf/src")
if(OS_FREEBSD AND SANITIZE STREQUAL "address")
# ../contrib/protobuf/src/google/protobuf/arena_impl.h:45:10: fatal error: 'sanitizer/asan_interface.h' file not found
# #include <sanitizer/asan_interface.h>
@@ -20,8 +20,8 @@ if(OS_FREEBSD AND SANITIZE STREQUAL "address")
endif()
endif()
set(protobuf_source_dir "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf")
set(protobuf_binary_dir "${ClickHouse_BINARY_DIR}/contrib/google-protobuf")
set(protobuf_source_dir "${Datastore_SOURCE_DIR}/contrib/google-protobuf")
set(protobuf_binary_dir "${Datastore_BINARY_DIR}/contrib/google-protobuf")
add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
@@ -440,7 +440,7 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME OR NOT CMAKE_HOST_SYST
set_target_properties (protoc PROPERTIES IMPORTED_LOCATION "${PROJECT_BINARY_DIR}/native/contrib/google-protobuf-cmake/protoc")
endif()
include("${ClickHouse_SOURCE_DIR}/contrib/google-protobuf-cmake/protobuf_generate.cmake")
include("${Datastore_SOURCE_DIR}/contrib/google-protobuf-cmake/protobuf_generate.cmake")
# These files needs to be installed to make it possible that users can use well-known protobuf types
set(google_proto_files
contrib/googletest-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/googletest")
set (SRC_DIR "${Datastore_SOURCE_DIR}/contrib/googletest")
add_library(_gtest "${SRC_DIR}/googletest/src/gtest-all.cc")
set_target_properties(_gtest PROPERTIES VERSION "1.0.0")
contrib/grpc-cmake/CMakeLists.txt
+3 -3
View File
@@ -8,8 +8,8 @@ endif()
set(CMAKE_CXX_STANDARD 17)
set(_gRPC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/grpc")
set(_gRPC_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/grpc")
set(_gRPC_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/grpc")
set(_gRPC_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/grpc")
if(TARGET OpenSSL::SSL)
set(gRPC_USE_UNSECURE_LIBRARIES FALSE)
@@ -22,7 +22,7 @@ endif()
include(grpc.cmake)
include(protobuf_generate_grpc.cmake)
set(gRPC_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/grpc/include")
set(gRPC_INCLUDE_DIRS "${Datastore_SOURCE_DIR}/contrib/grpc/include")
if(gRPC_USE_UNSECURE_LIBRARIES)
set(gRPC_LIBRARIES grpc_unsecure grpc++_unsecure)
else()
contrib/h3-cmake/CMakeLists.txt
+3 -3
View File
@@ -5,8 +5,8 @@ if(NOT ENABLE_H3)
return()
endif()
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 "${Datastore_SOURCE_DIR}/contrib/h3/src/h3lib")
set(H3_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/h3/src/h3lib")
set(SRCS
"${H3_SOURCE_DIR}/lib/algos.c"
@@ -30,7 +30,7 @@ set(SRCS
"${H3_SOURCE_DIR}/lib/baseCells.c"
)
file(READ "${ClickHouse_SOURCE_DIR}/contrib/h3/VERSION" H3_VERSION LIMIT_COUNT 1)
file(READ "${Datastore_SOURCE_DIR}/contrib/h3/VERSION" H3_VERSION LIMIT_COUNT 1)
# Clean any newlines
string(REPLACE "\n" "" H3_VERSION "${H3_VERSION}")
string(REPLACE "." ";" H3_VERSION_LIST "${H3_VERSION}")
contrib/hive-metastore-cmake/CMakeLists.txt
+4 -4
View File
@@ -10,12 +10,12 @@ if (NOT ENABLE_HIVE)
endif()
set (SRCS
${ClickHouse_SOURCE_DIR}/contrib/hive-metastore/hive_metastore_constants.cpp
${ClickHouse_SOURCE_DIR}/contrib/hive-metastore/hive_metastore_types.cpp
${ClickHouse_SOURCE_DIR}/contrib/hive-metastore/ThriftHiveMetastore.cpp
${Datastore_SOURCE_DIR}/contrib/hive-metastore/hive_metastore_constants.cpp
${Datastore_SOURCE_DIR}/contrib/hive-metastore/hive_metastore_types.cpp
${Datastore_SOURCE_DIR}/contrib/hive-metastore/ThriftHiveMetastore.cpp
)
add_library(_hivemetastore ${SRCS})
add_library(ch_contrib::hivemetastore ALIAS _hivemetastore)
target_link_libraries(_hivemetastore PUBLIC ch_contrib::thrift)
target_include_directories(_hivemetastore SYSTEM BEFORE PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/hive-metastore)
target_include_directories(_hivemetastore SYSTEM BEFORE PUBLIC ${Datastore_SOURCE_DIR}/contrib/hive-metastore)
contrib/icu-cmake/CMakeLists.txt
+2 -2
View File
@@ -9,8 +9,8 @@ if (NOT ENABLE_ICU)
return()
endif()
set(ICU_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source")
set(ICUDATA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icudata/")
set(ICU_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/icu/icu4c/source")
set(ICUDATA_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/icudata/")
# These lists of sources were generated from build log of the original ICU build system (configure + make).
contrib/idna-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if ((NOT ENABLE_IDNA))
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/idna")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/idna")
set (SRCS
"${LIBRARY_DIR}/src/idna.cpp"
contrib/isa-l-cmake/CMakeLists.txt
+1 -1
View File
@@ -10,7 +10,7 @@ if (NOT ENABLE_ISAL_LIBRARY)
return()
endif()
set(ISAL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/isa-l")
set(ISAL_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/isa-l")
# ISAL specifically needs NASM (the YASM assembler is partially compatible but produces
# weird build errors). Use an explicit `find_program` to locate NASM and feed the result
contrib/jemalloc-cmake/CMakeLists.txt
+1 -1
View File
@@ -66,7 +66,7 @@ if (JEMALLOC_CONFIG_MALLOC_CONF_OVERRIDE)
endif()
message (STATUS "jemalloc malloc_conf: ${JEMALLOC_CONFIG_MALLOC_CONF}")
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/jemalloc")
set (SRCS
"${LIBRARY_DIR}/src/arena.c"
contrib/jwt-cpp-cmake/CMakeLists.txt
+1 -1
View File
@@ -16,7 +16,7 @@ if(ENABLE_JWT_CPP)
endif()
endif()
set (JWT_CPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/jwt-cpp/include")
set (JWT_CPP_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/jwt-cpp/include")
add_library (_jwt-cpp INTERFACE)
target_include_directories(_jwt-cpp SYSTEM BEFORE INTERFACE ${JWT_CPP_INCLUDE_DIR})
contrib/krb5-cmake/CMakeLists.txt
+1 -1
View File
@@ -15,7 +15,7 @@ if(NOT AWK_PROGRAM)
message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
endif()
set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
set(KRB5_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/krb5/src")
set(KRB5_ET_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/include_private")
set(ALL_SRCS
contrib/lemmagen-c-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/lemmagen-c")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/lemmagen-c")
set(LEMMAGEN_INCLUDE_DIR "${LIBRARY_DIR}/include")
set(SRCS
contrib/libarchive-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libarchive")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/libarchive")
set(SRCS
"${LIBRARY_DIR}/libarchive/archive_acl.c"
contrib/libbcrypt-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_BCRYPT)
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libbcrypt")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/libbcrypt")
set(SRCS
"${LIBRARY_DIR}/bcrypt.c"
contrib/libcotp-cmake/CMakeLists.txt
+2 -2
View File
@@ -7,8 +7,8 @@ if (NOT ENABLE_LIBCOTP OR NOT ENABLE_SSL OR OS_FREEBSD)
return()
endif()
set (LIBCOTP_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcotp")
set (LIBCOTP_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libcotp")
set (LIBCOTP_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/libcotp")
set (LIBCOTP_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/libcotp")
set(SRCS
"${LIBCOTP_SOURCE_DIR}/src/otp.c"
contrib/libcpuid-cmake/CMakeLists.txt
+1 -1
View File
@@ -12,7 +12,7 @@ endif()
add_definitions (-D_GNU_SOURCE)
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcpuid")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/libcpuid")
set (SRCS
"${LIBRARY_DIR}/libcpuid/asm-bits.c"
contrib/libcxx-cmake/CMakeLists.txt
+3 -3
View File
@@ -1,7 +1,7 @@
set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxx")
set(LIBCXX_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/llvm-project/libcxx")
set(LIBCXX_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libcxx")
set(LIBCXX_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/llvm-project/libcxx")
set(LIBCXX_GENERATED_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++/v1")
set(LIBC_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libc")
set(LIBC_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libc")
set(SRCS
"${LIBCXX_SOURCE_DIR}/src/algorithm.cpp"
contrib/libcxxabi-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBCXXABI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxxabi")
set(LIBCXXABI_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libcxxabi")
set(SRCS
"${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp"
contrib/libdivide-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBDIVIDE_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libdivide")
set(LIBDIVIDE_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/libdivide")
add_library (_libdivide INTERFACE)
# for libdivide.h
target_include_directories (_libdivide SYSTEM BEFORE INTERFACE ${LIBDIVIDE_SOURCE_DIR})
contrib/libfiu-cmake/CMakeLists.txt
+1 -1
View File
@@ -3,7 +3,7 @@ if (NOT ENABLE_LIBFIU)
return ()
endif ()
set(LIBFIU_DIR "${ClickHouse_SOURCE_DIR}/contrib/libfiu/")
set(LIBFIU_DIR "${Datastore_SOURCE_DIR}/contrib/libfiu/")
set(LIBFIU_SOURCES
${LIBFIU_DIR}/libfiu/fiu.c
contrib/libfuzzer-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(COMPILER_RT_FUZZER_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt/lib/fuzzer")
set(COMPILER_RT_FUZZER_SRC_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/compiler-rt/lib/fuzzer")
set(FUZZER_SRCS
"${COMPILER_RT_FUZZER_SRC_DIR}/FuzzerCrossOver.cpp"
contrib/libgsasl-cmake/CMakeLists.txt
+2 -2
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_GSASL_LIBRARY)
return()
endif()
set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/libgsasl")
set (SRC_DIR "${Datastore_SOURCE_DIR}/contrib/libgsasl")
set(SRCS
${SRC_DIR}/gl/gc-gnulib.c
@@ -105,7 +105,7 @@ target_include_directories(_gsasl PUBLIC ${SRC_DIR})
target_include_directories(_gsasl PUBLIC ${SRC_DIR}/gl)
target_include_directories(_gsasl PUBLIC ${SRC_DIR}/src)
target_include_directories(_gsasl PUBLIC ${SRC_DIR}/digest-md5)
target_include_directories(_gsasl PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include")
target_include_directories(_gsasl PUBLIC "${Datastore_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include")
target_compile_definitions(_gsasl PRIVATE HAVE_CONFIG_H=1)
contrib/libhdfs3-cmake/CMakeLists.txt
+3 -3
View File
@@ -16,7 +16,7 @@ else()
endif()
# project and source dir
set(HDFS3_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3")
set(HDFS3_ROOT_DIR "${Datastore_SOURCE_DIR}/contrib/libhdfs3")
set(HDFS3_SOURCE_DIR "${HDFS3_ROOT_DIR}/src")
set(HDFS3_COMMON_DIR "${HDFS3_SOURCE_DIR}/common")
@@ -159,7 +159,7 @@ add_library(_hdfs3 ${SRCS})
add_dependencies(_hdfs3 protoc)
target_compile_options(_hdfs3 PRIVATE
-include "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src/google/protobuf/stubs/port.h"
-include "${Datastore_SOURCE_DIR}/contrib/google-protobuf/src/google/protobuf/stubs/port.h"
)
if (ENABLE_CLICKHOUSE_BENCHMARK)
@@ -173,7 +173,7 @@ else ()
target_include_directories(_hdfs3 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
endif ()
target_include_directories(_hdfs3 SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include")
target_include_directories(_hdfs3 SYSTEM BEFORE INTERFACE "${Datastore_SOURCE_DIR}/contrib/libhdfs3/include")
target_link_libraries(_hdfs3 PRIVATE ch_contrib::gsasl)
if (WITH_KERBEROS)
contrib/libllvmlibc-cmake/CMakeLists.txt
+3 -3
View File
@@ -1,4 +1,4 @@
set(LIBLLVMLIBC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libc")
set(LIBLLVMLIBC_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libc")
# Only build on supported architectures
if (NOT (ARCH_AMD64 OR ARCH_AARCH64))
@@ -125,8 +125,8 @@ if (ARCH_AMD64)
"${CMAKE_CURRENT_SOURCE_DIR}/llvmlibc_dispatch.cpp"
)
target_include_directories(llvmlibc_dispatch PRIVATE
${ClickHouse_SOURCE_DIR}/src
${ClickHouse_SOURCE_DIR}/base
${Datastore_SOURCE_DIR}/src
${Datastore_SOURCE_DIR}/base
)
add_library(libllvmlibc INTERFACE)
contrib/libpqxx-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/libpqxx")
set (SRCS
"${LIBRARY_DIR}/src/array.cxx"
contrib/libprotobuf-mutator-cmake/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,7 @@ if (NOT USE_LIBPROTOBUF_MUTATOR)
return()
endif()
set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libprotobuf-mutator)
set(LIBRARY_DIR ${Datastore_SOURCE_DIR}/contrib/libprotobuf-mutator)
add_library(_protobuf-mutator
${LIBRARY_DIR}/src/libfuzzer/libfuzzer_macro.cc
contrib/librdkafka-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_KAFKA)
return()
endif()
set(RDKAFKA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
set(RDKAFKA_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/librdkafka/src")
set(SRCS
"${RDKAFKA_SOURCE_DIR}/cJSON.c" # see below
contrib/librseq-cmake/CMakeLists.txt
+1 -1
View File
@@ -3,7 +3,7 @@ if (NOT OS_LINUX)
return ()
endif ()
set (LIBRSEQ_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librseq")
set (LIBRSEQ_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/librseq")
add_library (_librseq STATIC
"${LIBRSEQ_SOURCE_DIR}/src/rseq.c"
contrib/libssh-cmake/CMakeLists.txt
+12 -12
View File
@@ -10,8 +10,8 @@ set(libssh_VERSION_MAJOR 0)
set(libssh_VERSION_MINOR 9)
set(libssh_VERSION_PATCH 8)
set(LIB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libssh")
set(LIB_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libssh")
set(LIB_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/libssh")
set(LIB_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/libssh")
set(libssh_SRCS
${LIB_SOURCE_DIR}/src/agent.c
@@ -102,31 +102,31 @@ target_include_directories(_ssh PUBLIC "${LIB_SOURCE_DIR}/include" "${LIB_BINARY
if (OS_LINUX)
if (ARCH_AMD64)
if (USE_MUSL)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/x86-64-musl")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/x86-64-musl")
else()
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/x86-64")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/x86-64")
endif ()
elseif (ARCH_AARCH64)
if (USE_MUSL)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/aarch64-musl")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/aarch64-musl")
else()
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/aarch64")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/aarch64")
endif ()
elseif (ARCH_PPC64LE)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/ppc64le")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/ppc64le")
elseif (ARCH_S390X)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/s390x")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/s390x")
elseif (ARCH_RISCV64)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/riscv64")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/riscv64")
elseif (ARCH_LOONGARCH64)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/loongarch64")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/linux/loongarch64")
else ()
message(FATAL_ERROR "Platform is not supported")
endif ()
elseif (OS_DARWIN)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/darwin")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/darwin")
elseif (OS_FREEBSD)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/freebsd")
target_include_directories(_ssh PRIVATE "${Datastore_SOURCE_DIR}/contrib/libssh-cmake/freebsd")
else ()
message(FATAL_ERROR "Platform is not supported")
endif()
contrib/libstemmer-c-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT WITH_LIBSTEMMER)
return()
endif()
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libstemmer_c")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/libstemmer_c")
add_library(_stemmer
${LIBRARY_DIR}/src_c/stem_UTF_8_arabic.c
contrib/libstemmer-c-cmake/README.md
+1 -1
View File
@@ -62,7 +62,7 @@ SOURCES=$(find contrib/libstemmer_c -name "*.c" -not -path "*/examples/*" | sort
cat > contrib/libstemmer-c-cmake/CMakeLists.txt << EOF
set(LIBRARY_DIR "\${ClickHouse_SOURCE_DIR}/contrib/libstemmer_c")
set(LIBRARY_DIR "\${Datastore_SOURCE_DIR}/contrib/libstemmer_c")
add_library(_stemmer
${SOURCES}
contrib/libunwind-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBUNWIND_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libunwind")
set(LIBUNWIND_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/libunwind")
set(LIBUNWIND_CXX_SOURCES
"${LIBUNWIND_SOURCE_DIR}/src/libunwind.cpp"
contrib/liburing-cmake/CMakeLists.txt
+4 -4
View File
@@ -11,8 +11,8 @@ if (NOT ENABLE_LIBURING)
return ()
endif ()
set (LIBURING_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/liburing/src/include")
set (LIBURING_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/liburing/src")
set (LIBURING_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/liburing/src/include")
set (LIBURING_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/liburing/src")
set (SRCS
"${LIBURING_SOURCE_DIR}/queue.c"
@@ -25,7 +25,7 @@ set (SRCS
add_compile_definitions (_GNU_SOURCE)
add_compile_definitions (LIBURING_INTERNAL)
set (LIBURING_COMPAT_INCLUDE_DIR "${ClickHouse_BINARY_DIR}/contrib/liburing/src/include-compat")
set (LIBURING_COMPAT_INCLUDE_DIR "${Datastore_BINARY_DIR}/contrib/liburing/src/include-compat")
set (LIBURING_COMPAT_HEADER "${LIBURING_COMPAT_INCLUDE_DIR}/liburing/compat.h")
set (LIBURING_CONFIG_HAS_KERNEL_RWF_T FALSE)
@@ -37,7 +37,7 @@ set (LIBURING_CONFIG_HAS_DISCARD_CMD FALSE)
configure_file (compat.h.in ${LIBURING_COMPAT_HEADER})
set (LIBURING_GENERATED_INCLUDE_DIR "${ClickHouse_BINARY_DIR}/contrib/liburing/src/include")
set (LIBURING_GENERATED_INCLUDE_DIR "${Datastore_BINARY_DIR}/contrib/liburing/src/include")
set (LIBURING_VERSION_HEADER "${LIBURING_GENERATED_INCLUDE_DIR}/liburing/io_uring_version.h")
file (READ "${LIBURING_SOURCE_DIR}/../liburing.spec" LIBURING_SPEC)
contrib/libxml2-cmake/CMakeLists.txt
+2 -2
View File
@@ -1,5 +1,5 @@
set(LIBXML2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libxml2")
set(LIBXML2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libxml2")
set(LIBXML2_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/libxml2")
set(LIBXML2_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/libxml2")
set(SRCS
"${LIBXML2_SOURCE_DIR}/buf.c"
contrib/llvm-project-cmake/CMakeLists.txt
+6 -6
View File
@@ -23,17 +23,17 @@ endif()
set (LLVM_VERSION "22.1.1bundled")
# Directories
set (LLVM_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/llvm")
set (LLVM_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/llvm-project/llvm")
set (LLVM_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/llvm-project/llvm")
set (LLVM_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/llvm-project/llvm")
set (LLVM_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set (LLVM_INCLUDE_DIRS
"${LLVM_SOURCE_DIR}/include"
"${LLVM_BINARY_DIR}/include"
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
"${Datastore_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
)
if (ENABLE_XRAY)
list(APPEND LLVM_INCLUDE_DIRS "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/compiler-rt/include")
list(APPEND LLVM_INCLUDE_DIRS "${Datastore_SOURCE_DIR}/contrib/llvm-project/compiler-rt/include")
endif()
# Target architecture
@@ -393,7 +393,7 @@ target_include_directories(llvm-min-tblgen PRIVATE
${LLVM_SOURCE_DIR}/include
${LLVM_BINARY_DIR}/include
${LLVM_SOURCE_DIR}/utils/TableGen
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
"${Datastore_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
)
target_compile_definitions(llvm-min-tblgen PRIVATE ${LLVM_COMPILE_DEFINITIONS})
@@ -541,7 +541,7 @@ target_include_directories(llvm-tblgen PRIVATE
${LLVM_BINARY_DIR}/include
${LLVM_SOURCE_DIR}/lib/Target
${LLVM_SOURCE_DIR}/utils/TableGen
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
"${Datastore_SOURCE_DIR}/contrib/llvm-project/third-party/siphash/include"
)
target_compile_definitions(llvm-tblgen PRIVATE ${LLVM_COMPILE_DEFINITIONS})
contrib/lz4-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
# lz4 is the main compression method, cannot be disabled.
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/lz4")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/lz4")
set (SRCS
"${LIBRARY_DIR}/lib/lz4.c"
"${LIBRARY_DIR}/lib/lz4hc.c"
contrib/magic-enum-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/magic_enum")
add_library(_magic_enum INTERFACE)
target_include_directories(_magic_enum SYSTEM INTERFACE ${LIBRARY_DIR}/include/magic_enum)
add_library(ch_contrib::magic_enum ALIAS _magic_enum)
contrib/miniselect-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,3 +1,3 @@
add_library(_miniselect INTERFACE)
target_include_directories(_miniselect BEFORE INTERFACE ${ClickHouse_SOURCE_DIR}/contrib/miniselect/include)
target_include_directories(_miniselect BEFORE INTERFACE ${Datastore_SOURCE_DIR}/contrib/miniselect/include)
add_library(ch_contrib::miniselect ALIAS _miniselect)
contrib/minizip-ng-cmake/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,7 @@ if (NOT ENABLE_MINIZIP)
return()
endif()
set(_MINIZIP_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/minizip-ng")
set(_MINIZIP_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/minizip-ng")
# Initial source files
set(MINIZIP_SRC
contrib/mongo-c-driver-cmake/CMakeLists.txt
+2 -2
View File
@@ -13,11 +13,11 @@ set(libmongoc_VERSION_MINOR 3)
set(libmongoc_VERSION_PATCH 0)
set(libmongoc_VERSION 2.3.0)
set(LIBBSON_SOURCES_ROOT "${ClickHouse_SOURCE_DIR}/contrib/mongo-c-driver/src")
set(LIBBSON_SOURCES_ROOT "${Datastore_SOURCE_DIR}/contrib/mongo-c-driver/src")
set(LIBBSON_SOURCE_DIR "${LIBBSON_SOURCES_ROOT}/libbson/src")
file(GLOB_RECURSE LIBBSON_SOURCES "${LIBBSON_SOURCE_DIR}/*.c")
set(LIBBSON_BINARY_ROOT "${ClickHouse_BINARY_DIR}/contrib/mongo-c-driver/src")
set(LIBBSON_BINARY_ROOT "${Datastore_BINARY_DIR}/contrib/mongo-c-driver/src")
set(LIBBSON_BINARY_DIR "${LIBBSON_BINARY_ROOT}/libbson/src")
# Hard-code endianness based on the target architecture (set in cmake/arch.cmake) instead
contrib/mongo-cxx-driver-cmake/CMakeLists.txt
+5 -5
View File
@@ -5,10 +5,10 @@ if(NOT USE_MONGODB)
return()
endif()
set(BSONCXX_SOURCES_DIR "${ClickHouse_SOURCE_DIR}/contrib/mongo-cxx-driver/src/bsoncxx")
set(BSONCXX_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/mongo-cxx-driver/src/bsoncxx")
set(BSONCXX_SOURCES_DIR "${Datastore_SOURCE_DIR}/contrib/mongo-cxx-driver/src/bsoncxx")
set(BSONCXX_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/mongo-cxx-driver/src/bsoncxx")
include(${ClickHouse_SOURCE_DIR}/cmake/generate_export_header.cmake)
include(${Datastore_SOURCE_DIR}/cmake/generate_export_header.cmake)
set(BSONCXX_SOURCES
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/private/itoa.cpp
@@ -96,8 +96,8 @@ datastore_generate_export_header(_bsoncxx
)
set(MONGOCXX_SOURCES_DIR "${ClickHouse_SOURCE_DIR}/contrib/mongo-cxx-driver/src/mongocxx")
set(MONGOCXX_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/mongo-cxx-driver/src/mongocxx")
set(MONGOCXX_SOURCES_DIR "${Datastore_SOURCE_DIR}/contrib/mongo-cxx-driver/src/mongocxx")
set(MONGOCXX_BINARY_DIR "${Datastore_BINARY_DIR}/contrib/mongo-cxx-driver/src/mongocxx")
set(MONGOCXX_SOURCES
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/private/bson.cpp
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/private/conversions.cpp
contrib/morton-nd-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,3 +1,3 @@
add_library(_morton_nd INTERFACE)
target_include_directories(_morton_nd SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/morton-nd/include/")
target_include_directories(_morton_nd SYSTEM BEFORE INTERFACE "${Datastore_SOURCE_DIR}/contrib/morton-nd/include/")
add_library(ch_contrib::morton_nd ALIAS _morton_nd)
contrib/msgpack-c-cmake/CMakeLists.txt
+1 -1
View File
@@ -6,5 +6,5 @@ if(NOT ENABLE_MSGPACK)
endif()
add_library(_msgpack INTERFACE)
target_include_directories(_msgpack SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include")
target_include_directories(_msgpack SYSTEM BEFORE INTERFACE "${Datastore_SOURCE_DIR}/contrib/msgpack-c/include")
add_library(ch_contrib::msgpack ALIAS _msgpack)
contrib/nats-io-cmake/CMakeLists.txt
+1 -1
View File
@@ -10,7 +10,7 @@ if (NOT ENABLE_NATS)
return()
endif()
set(NATS_IO_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nats-io/src")
set(NATS_IO_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/nats-io/src")
if(UNIX)
set(NATS_PLATFORM_INCLUDE "unix")
contrib/nlohmann-json-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(JSON_DIR ${ClickHouse_SOURCE_DIR}/contrib/nlohmann-json)
set(JSON_DIR ${Datastore_SOURCE_DIR}/contrib/nlohmann-json)
add_library(_nlohmann_json INTERFACE)
set_property(
TARGET _nlohmann_json
contrib/numactl-cmake/CMakeLists.txt
+1 -1
View File
@@ -15,7 +15,7 @@ if (NOT ENABLE_NUMACTL)
return()
endif ()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/numactl")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/numactl")
set (SRCS
"${LIBRARY_DIR}/libnuma.c"
contrib/nuraft-cmake/CMakeLists.txt
+2 -2
View File
@@ -10,7 +10,7 @@ if (NOT ENABLE_NURAFT)
return()
endif()
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/NuRaft")
set(LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/NuRaft")
set(SRCS
"${LIBRARY_DIR}/src/handle_priority.cxx"
@@ -59,7 +59,7 @@ target_compile_definitions(_nuraft PUBLIC USE_CLICKHOUSE_THREADS=1)
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 "${Datastore_SOURCE_DIR}/contrib/boost/boost")
target_link_libraries (_nuraft PRIVATE boost::headers_only boost::coroutine)
contrib/openldap-cmake/CMakeLists.txt
+1 -1
View File
@@ -29,7 +29,7 @@ if (NOT(
message (${RECONFIGURE_MESSAGE_LEVEL} "LDAP support using the bundled library is not implemented for ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} platform.")
endif ()
set(OPENLDAP_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
set(OPENLDAP_SOURCE_DIR "${Datastore_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.
contrib/openssl-cmake/CMakeLists.txt
+1 -1
View File
@@ -27,7 +27,7 @@ endif()
# (*) https://github.com/openssl/openssl/blob/master/INSTALL.md
set(OPENSSL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/openssl)
set(OPENSSL_SOURCE_DIR ${Datastore_SOURCE_DIR}/contrib/openssl)
set(OPENSSLDIR "/etc/ssl" CACHE PATH "Set the default openssl directory")
set(OPENSSL_ENGINESDIR "/usr/local/lib/engines-3" CACHE PATH "Set the default openssl directory for engines")
contrib/pdqsort-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,3 +1,3 @@
add_library(_pdqsort INTERFACE)
target_include_directories(_pdqsort SYSTEM BEFORE INTERFACE ${ClickHouse_SOURCE_DIR}/contrib/pdqsort)
target_include_directories(_pdqsort SYSTEM BEFORE INTERFACE ${Datastore_SOURCE_DIR}/contrib/pdqsort)
add_library(ch_contrib::pdqsort ALIAS _pdqsort)
contrib/pocketfft-cmake/CMakeLists.txt
+1 -1
View File
@@ -6,5 +6,5 @@ if (NOT ENABLE_POCKETFFT)
endif()
add_library(_pocketfft INTERFACE)
target_include_directories(_pocketfft INTERFACE ${ClickHouse_SOURCE_DIR}/contrib/pocketfft)
target_include_directories(_pocketfft INTERFACE ${Datastore_SOURCE_DIR}/contrib/pocketfft)
add_library(ch_contrib::pocketfft ALIAS _pocketfft)
contrib/postgres-cmake/CMakeLists.txt
+2 -2
View File
@@ -1,8 +1,8 @@
# Build description for libpq which is part of the PostgreSQL sources
set(POSTGRES_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/postgres")
set(POSTGRES_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/postgres")
set(LIBPQ_SOURCE_DIR "${POSTGRES_SOURCE_DIR}/src/interfaces/libpq")
set(LIBPQ_CMAKE_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/postgres-cmake")
set(LIBPQ_CMAKE_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/postgres-cmake")
set(SRCS
"${LIBPQ_SOURCE_DIR}/fe-auth.c"
contrib/prometheus-protobufs-cmake/CMakeLists.txt
+3 -3
View File
@@ -5,9 +5,9 @@ if(NOT ENABLE_PROMETHEUS_PROTOBUFS)
return()
endif()
set(Protobuf_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src")
set(Prometheus_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/prometheus-protobufs")
set(GogoProto_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/prometheus-protobufs-gogo")
set(Protobuf_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/google-protobuf/src")
set(Prometheus_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/prometheus-protobufs")
set(GogoProto_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/prometheus-protobufs-gogo")
# Protobuf_IMPORT_DIRS specify where the protobuf compiler will look for .proto files.
set(Old_Protobuf_IMPORT_DIRS ${Protobuf_IMPORT_DIRS})
contrib/rapidjson-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if(NOT ENABLE_RAPIDJSON)
return()
endif()
set(RAPIDJSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include")
set(RAPIDJSON_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/rapidjson/include")
add_library(_rapidjson INTERFACE)
target_include_directories(_rapidjson SYSTEM BEFORE INTERFACE ${RAPIDJSON_INCLUDE_DIR})
add_library(ch_contrib::rapidjson ALIAS _rapidjson)
contrib/re2-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/re2")
set(SRC_DIR "${Datastore_SOURCE_DIR}/contrib/re2")
set(RE2_SOURCES
${SRC_DIR}/re2/bitmap256.cc
contrib/replxx-cmake/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/replxx")
set (LIBRARY_DIR "${Datastore_SOURCE_DIR}/contrib/replxx")
set(SRCS
"${LIBRARY_DIR}/src/conversion.cxx"
contrib/rocksdb-cmake/CMakeLists.txt
+1 -1
View File
@@ -13,7 +13,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
endif()
set(ROCKSDB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb")
set(ROCKSDB_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/rocksdb")
include_directories(${ROCKSDB_SOURCE_DIR})
include_directories("${ROCKSDB_SOURCE_DIR}/include")
contrib/s2geometry-cmake/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ if (NOT ENABLE_S2_GEOMETRY)
return()
endif()
set(S2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src")
set(S2_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/s2geometry/src")
set(S2_SRCS
"${S2_SOURCE_DIR}/s2/base/malloc_extension.cc"
contrib/sha3iuf-cmake/CMakeLists.txt
+2 -2
View File
@@ -1,5 +1,5 @@
set(SHA3IUF_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/SHA3IUF")
set(SHA3IUF_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/SHA3IUF")
set(SHA3IUF_INCLUDE_DIR "${Datastore_SOURCE_DIR}/contrib/SHA3IUF")
set(SHA3IUF_SRC_DIR "${Datastore_SOURCE_DIR}/contrib/SHA3IUF")
set(SHA3IUF_SRC ${SHA3IUF_SRC_DIR}/sha3.c)
add_library(_sha3iuf ${SHA3IUF_SRC})
contrib/silk-cmake/CMakeLists.txt
+1 -1
View File
@@ -18,7 +18,7 @@ if(NOT TARGET ch_contrib::librseq)
return()
endif()
set(SILK_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/silk")
set(SILK_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/silk")
# silk-util
file(GLOB SILK_UTIL_SOURCES "${SILK_SOURCE_DIR}/src/util/*.cpp")

Some files were not shown because too many files have changed in this diff Show More