thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Robert Schulze 2022-06-01 10:10:06 +02:00
parent 249fe561f4
commit 12871a43e1
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
16 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/abseil-cpp-cmake/CMakeLists.txt
View File

@ -1,7 +1,4 @@
set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp") set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
if(NOT EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt")
message(FATAL_ERROR " submodule third_party/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
endif()
set(BUILD_TESTING OFF) set(BUILD_TESTING OFF)
set(ABSL_PROPAGATE_CXX_STD ON) set(ABSL_PROPAGATE_CXX_STD ON)
add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp") add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")

1
contrib/amqpcpp-cmake/CMakeLists.txt
View File

@ -5,6 +5,7 @@ if (NOT ENABLE_AMQPCPP)
return() return()
endif() endif()
# can be removed once libuv build on MacOS with GCC is possible
if (NOT TARGET ch_contrib::uv) if (NOT TARGET ch_contrib::uv)
message(STATUS "Not using AMQP-CPP because libuv is disabled") message(STATUS "Not using AMQP-CPP because libuv is disabled")
return() return()

2
contrib/arrow-cmake/CMakeLists.txt
View File

@ -20,7 +20,7 @@ endif()
option (ENABLE_PARQUET "Enable parquet" ${ENABLE_PARQUET_DEFAULT}) option (ENABLE_PARQUET "Enable parquet" ${ENABLE_PARQUET_DEFAULT})
if (NOT ENABLE_PARQUET) if (NOT ENABLE_PARQUET)
message(STATUS "Building without Parquet support") message(STATUS "Not using parquet")
return() return()
endif() endif()

6
contrib/bzip2-cmake/CMakeLists.txt
View File

@ -1,6 +1,6 @@
option(ENABLE_BZIP2 "Enable bzip2 compression support" ${ENABLE_LIBRARIES}) option(ENABLE_BZIP2 "Enable bzip2 compression support" ${ENABLE_LIBRARIES})
if (NOT ENABLE_BZIP2) if (NOT ENABLE_BZIP2)
message (STATUS "bzip2 compression disabled") message (STATUS "Not using bzip2")
return() return()
endif() endif()
@ -26,8 +26,4 @@ configure_file (
add_library(_bzip2 ${SRCS}) add_library(_bzip2 ${SRCS})
add_library(ch_contrib::bzip2 ALIAS _bzip2) add_library(ch_contrib::bzip2 ALIAS _bzip2)
# To avoid -Wreserved-id-macro we use SYSTEM:
#
# clickhouse/contrib/bzip2/bzlib.h:23:9: error: macro name is a reserved identifier [-Werror,-Wreserved-id-macro]
# #define _BZLIB_H
target_include_directories(_bzip2 SYSTEM BEFORE PUBLIC "${BZIP2_SOURCE_DIR}" "${BZIP2_BINARY_DIR}") target_include_directories(_bzip2 SYSTEM BEFORE PUBLIC "${BZIP2_SOURCE_DIR}" "${BZIP2_BINARY_DIR}")

1
contrib/cassandra-cmake/CMakeLists.txt
View File

@ -5,6 +5,7 @@ if (NOT ENABLE_CASSANDRA)
return() return()
endif() endif()
# can be removed once libuv build on MacOS with GCC is possible
if (NOT TARGET ch_contrib::uv) if (NOT TARGET ch_contrib::uv)
message(STATUS "Not using cassandra because libuv is disabled") message(STATUS "Not using cassandra because libuv is disabled")
return() return()

2
contrib/cppkafka-cmake/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if (NOT ENABLE_KAFKA) if (NOT ENABLE_KAFKA)
message(STATUS "Not using librdkafka (skip cppkafka)") message(STATUS "Not using kafka")
return() return()
endif() endif()

2
contrib/fastops-cmake/CMakeLists.txt
View File

@ -5,7 +5,7 @@ elseif(ENABLE_FASTOPS)
endif() endif()
if(NOT ENABLE_FASTOPS) if(NOT ENABLE_FASTOPS)
message(STATUS "Not using fast vectorized mathematical functions library by Mikhail Parakhin") message(STATUS "Not using fastops")
return() return()
endif() endif()

32
contrib/fmtlib-cmake/CMakeLists.txt
View File

@ -1,22 +1,24 @@
set(FMT_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/fmtlib")
set (SRCS set (SRCS
# NOTE: do not build module for now: # NOTE: do not build module for now:
# ../fmtlib/src/fmt.cc # ../fmtlib/src/fmt.cc
../fmtlib/src/format.cc ${FMT_SOURCE_DIR}/src/format.cc
../fmtlib/src/os.cc ${FMT_SOURCE_DIR}/src/os.cc
../fmtlib/include/fmt/args.h ${FMT_SOURCE_DIR}/include/fmt/args.h
../fmtlib/include/fmt/chrono.h ${FMT_SOURCE_DIR}/include/fmt/chrono.h
../fmtlib/include/fmt/color.h ${FMT_SOURCE_DIR}/include/fmt/color.h
../fmtlib/include/fmt/compile.h ${FMT_SOURCE_DIR}/include/fmt/compile.h
../fmtlib/include/fmt/core.h ${FMT_SOURCE_DIR}/include/fmt/core.h
../fmtlib/include/fmt/format.h ${FMT_SOURCE_DIR}/include/fmt/format.h
../fmtlib/include/fmt/format-inl.h ${FMT_SOURCE_DIR}/include/fmt/format-inl.h
../fmtlib/include/fmt/locale.h ${FMT_SOURCE_DIR}/include/fmt/locale.h
../fmtlib/include/fmt/os.h ${FMT_SOURCE_DIR}/include/fmt/os.h
../fmtlib/include/fmt/ostream.h ${FMT_SOURCE_DIR}/include/fmt/ostream.h
../fmtlib/include/fmt/printf.h ${FMT_SOURCE_DIR}/include/fmt/printf.h
../fmtlib/include/fmt/ranges.h ${FMT_SOURCE_DIR}/include/fmt/ranges.h
../fmtlib/include/fmt/xchar.h ${FMT_SOURCE_DIR}/include/fmt/xchar.h
) )
add_library(_fmt ${SRCS}) add_library(_fmt ${SRCS})

34
contrib/h3-cmake/CMakeLists.txt
View File

@ -9,23 +9,23 @@ set(H3_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib")
set(H3_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib") set(H3_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib")
set(SRCS set(SRCS
"${H3_SOURCE_DIR}/lib/algos.c" "${H3_SOURCE_DIR}/lib/algos.c"
"${H3_SOURCE_DIR}/lib/coordijk.c" "${H3_SOURCE_DIR}/lib/coordijk.c"
"${H3_SOURCE_DIR}/lib/bbox.c" "${H3_SOURCE_DIR}/lib/bbox.c"
"${H3_SOURCE_DIR}/lib/polygon.c" "${H3_SOURCE_DIR}/lib/polygon.c"
"${H3_SOURCE_DIR}/lib/h3Index.c" "${H3_SOURCE_DIR}/lib/h3Index.c"
"${H3_SOURCE_DIR}/lib/vec2d.c" "${H3_SOURCE_DIR}/lib/vec2d.c"
"${H3_SOURCE_DIR}/lib/vec3d.c" "${H3_SOURCE_DIR}/lib/vec3d.c"
"${H3_SOURCE_DIR}/lib/vertex.c" "${H3_SOURCE_DIR}/lib/vertex.c"
"${H3_SOURCE_DIR}/lib/linkedGeo.c" "${H3_SOURCE_DIR}/lib/linkedGeo.c"
"${H3_SOURCE_DIR}/lib/localij.c" "${H3_SOURCE_DIR}/lib/localij.c"
"${H3_SOURCE_DIR}/lib/latLng.c" "${H3_SOURCE_DIR}/lib/latLng.c"
"${H3_SOURCE_DIR}/lib/directedEdge.c" "${H3_SOURCE_DIR}/lib/directedEdge.c"
"${H3_SOURCE_DIR}/lib/mathExtensions.c" "${H3_SOURCE_DIR}/lib/mathExtensions.c"
"${H3_SOURCE_DIR}/lib/iterators.c" "${H3_SOURCE_DIR}/lib/iterators.c"
"${H3_SOURCE_DIR}/lib/vertexGraph.c" "${H3_SOURCE_DIR}/lib/vertexGraph.c"
"${H3_SOURCE_DIR}/lib/faceijk.c" "${H3_SOURCE_DIR}/lib/faceijk.c"
"${H3_SOURCE_DIR}/lib/baseCells.c" "${H3_SOURCE_DIR}/lib/baseCells.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")

2
contrib/hive-metastore-cmake/CMakeLists.txt
View File

@ -5,7 +5,7 @@ elseif(ENABLE_HIVE)
endif() endif()
if (NOT ENABLE_HIVE) if (NOT ENABLE_HIVE)
message("Hive disabled") message(STATUS "Not using hive")
return() return()
endif() endif()

2
contrib/libcpuid-cmake/CMakeLists.txt
View File

@ -6,7 +6,7 @@ elseif(ENABLE_CPUID)
endif() endif()
if (NOT ENABLE_CPUID) if (NOT ENABLE_CPUID)
message("Not using cpuid") message(STATUS "Not using cpuid")
return() return()
endif() endif()

2
contrib/libgsasl-cmake/CMakeLists.txt
View File

@ -1,7 +1,7 @@
option(ENABLE_GSASL_LIBRARY "Enable gsasl library" ${ENABLE_LIBRARIES}) option(ENABLE_GSASL_LIBRARY "Enable gsasl library" ${ENABLE_LIBRARIES})
if (NOT ENABLE_GSASL_LIBRARY) if (NOT ENABLE_GSASL_LIBRARY)
message(STATUS "Not using gsasl library") message(STATUS "Not using gsasl")
return() return()
endif() endif()

1
contrib/libuv-cmake/CMakeLists.txt
View File

@ -1,3 +1,4 @@
# once fixed, please remove similar places in CMakeLists of libuv users (search "ch_contrib::uv")
if (OS_DARWIN AND COMPILER_GCC) 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") message (WARNING "libuv cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082")
return() return()

2
contrib/minizip-ng-cmake/CMakeLists.txt
View File

@ -1,6 +1,6 @@
option(ENABLE_MINIZIP "Enable minizip-ng the zip manipulation library" ${ENABLE_LIBRARIES}) option(ENABLE_MINIZIP "Enable minizip-ng the zip manipulation library" ${ENABLE_LIBRARIES})
if (NOT ENABLE_MINIZIP) if (NOT ENABLE_MINIZIP)
message (STATUS "minizip-ng disabled") message (STATUS "Not using minizip-ng")
return() return()
endif() endif()

4
contrib/nanodbc-cmake/CMakeLists.txt
View File

@ -2,12 +2,12 @@ if (NOT ENABLE_ODBC)
return () return ()
endif () endif ()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
if (NOT TARGET ch_contrib::unixodbc) if (NOT TARGET ch_contrib::unixodbc)
message(FATAL_ERROR "Configuration error: unixodbc is not a target") message(FATAL_ERROR "Configuration error: unixodbc is not a target")
endif() endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
set (SRCS set (SRCS
"${LIBRARY_DIR}/nanodbc/nanodbc.cpp" "${LIBRARY_DIR}/nanodbc/nanodbc.cpp"
) )

2
contrib/thrift-cmake/CMakeLists.txt
View File

@ -1,7 +1,7 @@
option(ENABLE_THRIFT "Enable Thrift" ${ENABLE_LIBRARIES}) option(ENABLE_THRIFT "Enable Thrift" ${ENABLE_LIBRARIES})
if (NOT ENABLE_THRIFT) if (NOT ENABLE_THRIFT)
message (STATUS "thrift disabled") message (STATUS "Not using thrift")
return() return()
endif() endif()