thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to restrict the curl, azure and sentry build in MacOS

Browse Source
This commit is contained in:
Meena Renganathan 2022-04-06 06:28:35 -07:00
parent 05ffa45907
commit 0d0b1ef7dc
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -222,6 +222,12 @@ else ()
set(NO_WHOLE_ARCHIVE --no-whole-archive) set(NO_WHOLE_ARCHIVE --no-whole-archive)
endif () endif ()
option(ENABLE_CURL_BUILD "Enable curl, azure, sentry build on by default except MacOS." ON)
if (OS_DARWIN)
# Disable the curl, azure, senry build on MacOS
set (ENABLE_CURL_BUILD OFF)
endif ()
# Ignored if `lld` is used # Ignored if `lld` is used
option(ADD_GDB_INDEX_FOR_GOLD "Add .gdb-index to resulting binaries for gold linker.") option(ADD_GDB_INDEX_FOR_GOLD "Add .gdb-index to resulting binaries for gold linker.")

10
contrib/CMakeLists.txt vendored
View File

@ -119,9 +119,13 @@ add_contrib (fastops-cmake fastops)
add_contrib (libuv-cmake libuv) add_contrib (libuv-cmake libuv)
add_contrib (amqpcpp-cmake AMQP-CPP) # requires: libuv add_contrib (amqpcpp-cmake AMQP-CPP) # requires: libuv
add_contrib (cassandra-cmake cassandra) # requires: libuv add_contrib (cassandra-cmake cassandra) # requires: libuv
add_contrib (curl-cmake curl)
add_contrib (azure-cmake azure) if (ENABLE_CURL_BUILD)
add_contrib (sentry-native-cmake sentry-native) # requires: curl add_contrib (curl-cmake curl)
add_contrib (azure-cmake azure)
add_contrib (sentry-native-cmake sentry-native) # requires: curl
endif()
add_contrib (fmtlib-cmake fmtlib) add_contrib (fmtlib-cmake fmtlib)
add_contrib (krb5-cmake krb5) add_contrib (krb5-cmake krb5)
add_contrib (cyrus-sasl-cmake cyrus-sasl) # for krb5 add_contrib (cyrus-sasl-cmake cyrus-sasl) # for krb5

19
contrib/curl-cmake/CMakeLists.txt
View File

@ -153,22 +153,6 @@ set (SRCS
add_library (_curl ${SRCS}) add_library (_curl ${SRCS})
set(CURL_LIBS "")
if(APPLE)
find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
message(FATAL_ERROR "SystemConfiguration framework not found")
endif()
set(CURL_LIBS ${CURL_LIBS} "-framework SystemConfiguration")
find_library(COREFOUNDATION_FRAMEWORK "CoreFoundation")
if(NOT COREFOUNDATION_FRAMEWORK)
message(FATAL_ERROR "CoreFoundation framework not found")
endif()
set(CURL_LIBS ${CURL_LIBS} "-framework CoreFoundation")
endif()
target_compile_definitions (_curl PRIVATE target_compile_definitions (_curl PRIVATE
HAVE_CONFIG_H HAVE_CONFIG_H
BUILDING_LIBCURL BUILDING_LIBCURL
@ -182,8 +166,7 @@ target_include_directories (_curl SYSTEM PUBLIC
. # curl_config.h . # curl_config.h
) )
set(CURL_LIBS ${CURL_LIBS} OpenSSL::SSL) target_link_libraries (_curl PRIVATE OpenSSL::SSL)
target_link_libraries (_curl PRIVATE ${CURL_LIBS})
# The library is large - avoid bloat (XXX: is it?) # The library is large - avoid bloat (XXX: is it?)
target_compile_options (_curl PRIVATE -g0) target_compile_options (_curl PRIVATE -g0)

3
contrib/curl-cmake/curl_config.h
View File

@ -48,6 +48,3 @@
#define ENABLE_IPV6 #define ENABLE_IPV6
#define USE_OPENSSL #define USE_OPENSSL
#define USE_THREADS_POSIX #define USE_THREADS_POSIX
#define HAVE_BOOL_T 1
#define HAVE_STDBOOL_H 1