thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup sentry support

Browse Source
This commit is contained in:
Azat Khuzhin 2022-01-18 01:08:35 +03:00
parent 4f4ec8912b
commit 3147bbab51
7 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -489,7 +489,6 @@ include (GNUInstallDirs)
include (cmake/find/llvm.cmake) include (cmake/find/llvm.cmake)
include (cmake/find/s3.cmake) include (cmake/find/s3.cmake)
include (cmake/find/nlp.cmake) include (cmake/find/nlp.cmake)
include (cmake/find/sentry.cmake)
include (cmake/find/datasketches.cmake) include (cmake/find/datasketches.cmake)
# Need to process before "contrib" dir: # Need to process before "contrib" dir:

4
base/daemon/CMakeLists.txt
View File

@ -12,6 +12,6 @@ endif()
target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${EXECINFO_LIBRARIES}) target_link_libraries (daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common ${EXECINFO_LIBRARIES})
if (USE_SENTRY) if (TARGET ch_contrib::sentry)
target_link_libraries (daemon PRIVATE ${SENTRY_LIBRARY}) target_link_libraries (daemon PRIVATE ch_contrib::sentry)
endif () endif ()

23
cmake/find/sentry.cmake
View File

@ -1,23 +0,0 @@
set (SENTRY_LIBRARY "sentry")
set (SENTRY_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/sentry-native/include")
if (NOT EXISTS "${SENTRY_INCLUDE_DIR}/sentry.h")
message (WARNING "submodule contrib/sentry-native is missing. to fix try run: \n git submodule update --init")
if (USE_SENTRY)
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal sentry library")
endif()
return()
endif ()
if (NOT OS_FREEBSD AND NOT SPLIT_SHARED_LIBRARIES AND NOT (OS_DARWIN AND COMPILER_CLANG))
option (USE_SENTRY "Use Sentry" ${ENABLE_LIBRARIES})
set (SENTRY_TRANSPORT "curl" CACHE STRING "")
set (SENTRY_BACKEND "none" CACHE STRING "")
set (SENTRY_EXPORT_SYMBOLS OFF CACHE BOOL "")
set (SENTRY_LINK_PTHREAD OFF CACHE BOOL "")
set (SENTRY_PIC OFF CACHE BOOL "")
set (BUILD_SHARED_LIBS OFF)
message (STATUS "Using sentry=${USE_SENTRY}: ${SENTRY_LIBRARY}")
elseif (USE_SENTRY)
message (${RECONFIGURE_MESSAGE_LEVEL} "Sentry is not supported in current configuration")
endif ()

6
cmake/target.cmake
View File

@ -27,10 +27,10 @@ if (CMAKE_CROSSCOMPILING)
if (ARCH_AARCH64) if (ARCH_AARCH64)
# FIXME: broken dependencies # FIXME: broken dependencies
set (ENABLE_GRPC OFF CACHE INTERNAL "") set (ENABLE_GRPC OFF CACHE INTERNAL "")
set (USE_SENTRY OFF CACHE INTERNAL "") set (ENABLE_SENTRY OFF CACHE INTERNAL "")
elseif (ARCH_PPC64LE) elseif (ARCH_PPC64LE)
set (ENABLE_GRPC OFF CACHE INTERNAL "") set (ENABLE_GRPC OFF CACHE INTERNAL "")
set (USE_SENTRY OFF CACHE INTERNAL "") set (ENABLE_SENTRY OFF CACHE INTERNAL "")
endif () endif ()
elseif (OS_FREEBSD) elseif (OS_FREEBSD)
# FIXME: broken dependencies # FIXME: broken dependencies
@ -43,7 +43,7 @@ if (CMAKE_CROSSCOMPILING)
endif () endif ()
if (USE_MUSL) if (USE_MUSL)
set (USE_SENTRY OFF CACHE INTERNAL "") set (ENABLE_SENTRY OFF CACHE INTERNAL "")
set (ENABLE_ODBC OFF CACHE INTERNAL "") set (ENABLE_ODBC OFF CACHE INTERNAL "")
set (ENABLE_GRPC OFF CACHE INTERNAL "") set (ENABLE_GRPC OFF CACHE INTERNAL "")
set (ENABLE_HDFS OFF CACHE INTERNAL "") set (ENABLE_HDFS OFF CACHE INTERNAL "")

10
contrib/CMakeLists.txt vendored
View File

@ -129,17 +129,9 @@ add_subdirectory (fastops-cmake)
add_subdirectory (libuv-cmake) add_subdirectory (libuv-cmake)
add_subdirectory (amqpcpp-cmake) # requires: libuv add_subdirectory (amqpcpp-cmake) # requires: libuv
add_subdirectory (cassandra-cmake) # requires: libuv add_subdirectory (cassandra-cmake) # requires: libuv
# Should go before:
# - sentry-native
add_subdirectory (curl-cmake) add_subdirectory (curl-cmake)
add_subdirectory (azure-cmake) add_subdirectory (azure-cmake)
add_subdirectory (sentry-native-cmake) # requires: curl
if (USE_SENTRY)
add_subdirectory (sentry-native-cmake)
endif()
add_subdirectory (fmtlib-cmake) add_subdirectory (fmtlib-cmake)
add_subdirectory (krb5-cmake) add_subdirectory (krb5-cmake)
add_subdirectory (cyrus-sasl-cmake) # for krb5 add_subdirectory (cyrus-sasl-cmake) # for krb5

13
contrib/sentry-native-cmake/CMakeLists.txt
View File

@ -1,3 +1,14 @@
if (NOT OS_FREEBSD AND NOT SPLIT_SHARED_LIBRARIES AND NOT (OS_DARWIN AND COMPILER_CLANG))
option (ENABLE_SENTRY "Enable Sentry" ${ENABLE_LIBRARIES})
else()
option (ENABLE_SENTRY "Enable Sentry" OFF)
endif()
if (NOT ENABLE_SENTRY)
message(STATUS "Not using sentry")
return()
endif()
set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/sentry-native") set (SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/sentry-native")
set (SRCS set (SRCS
@ -50,3 +61,5 @@ endif()
target_link_libraries(sentry PRIVATE ch_contrib::curl pthread) target_link_libraries(sentry PRIVATE ch_contrib::curl pthread)
target_include_directories(sentry PUBLIC "${SRC_DIR}/include" PRIVATE "${SRC_DIR}/src") target_include_directories(sentry PUBLIC "${SRC_DIR}/include" PRIVATE "${SRC_DIR}/src")
target_compile_definitions(sentry PRIVATE SENTRY_WITH_INPROC_BACKEND SIZEOF_LONG=8) target_compile_definitions(sentry PRIVATE SENTRY_WITH_INPROC_BACKEND SIZEOF_LONG=8)
add_library(ch_contrib::sentry ALIAS sentry)

3
src/configure_config.cmake
View File

@ -64,3 +64,6 @@ endif()
if (TARGET ch_contrib::krb5) if (TARGET ch_contrib::krb5)
set(USE_KRB5 1) set(USE_KRB5 1)
endif() endif()
if (TARGET ch_contrib::sentry)
set(USE_SENTRY 1)
endif()