From 4f4ec8912bcf8b3ab5404a24b790bfce39afe960 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 18 Jan 2022 01:02:56 +0300
Subject: [PATCH] Remove unbundled curl support

---
 CMakeLists.txt                             |  1 -
 cmake/find/curl.cmake                      | 35 ----------------------
 contrib/azure-cmake/CMakeLists.txt         |  4 +--
 contrib/curl-cmake/CMakeLists.txt          | 10 ++++---
 contrib/sentry-native-cmake/CMakeLists.txt |  2 +-
 5 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 cmake/find/curl.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 589988ed2bb..39e4bc3f20b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -487,7 +487,6 @@ message (STATUS
 include (GNUInstallDirs)
 
 include (cmake/find/llvm.cmake)
-include (cmake/find/curl.cmake)
 include (cmake/find/s3.cmake)
 include (cmake/find/nlp.cmake)
 include (cmake/find/sentry.cmake)
diff --git a/cmake/find/curl.cmake b/cmake/find/curl.cmake
deleted file mode 100644
index 577b13698c2..00000000000
--- a/cmake/find/curl.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-option (ENABLE_CURL "Enable curl" ${ENABLE_LIBRARIES})
-
-if (NOT ENABLE_CURL)
-    if (USE_INTERNAL_CURL)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal curl with ENABLE_CURL=OFF")
-    endif()
-    return()
-endif()
-
-option (USE_INTERNAL_CURL "Use internal curl library" ON)
-
-if (NOT USE_INTERNAL_CURL)
-    find_package (CURL)
-    if (NOT CURL_FOUND)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system curl")
-    endif()
-endif()
-
-if (NOT CURL_FOUND)
-    set (USE_INTERNAL_CURL 1)
-    set (CURL_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
-
-    # find_package(CURL) compatibility for the following packages that uses
-    # find_package(CURL)/include(FindCURL):
-    # - sentry-native
-    set (CURL_FOUND ON CACHE BOOL "")
-    set (CURL_ROOT_DIR ${CURL_LIBRARY_DIR} CACHE PATH "")
-    set (CURL_INCLUDE_DIR ${CURL_LIBRARY_DIR}/include CACHE PATH "")
-    set (CURL_INCLUDE_DIRS ${CURL_LIBRARY_DIR}/include CACHE PATH "")
-    set (CURL_LIBRARY curl CACHE STRING "")
-    set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
-    set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
-endif ()
-
-message (STATUS "Using curl: ${CURL_INCLUDE_DIRS} : ${CURL_LIBRARIES}")
diff --git a/contrib/azure-cmake/CMakeLists.txt b/contrib/azure-cmake/CMakeLists.txt
index d914732956a..031d8dc9a0b 100644
--- a/contrib/azure-cmake/CMakeLists.txt
+++ b/contrib/azure-cmake/CMakeLists.txt
@@ -72,8 +72,8 @@ if (TARGET OpenSSL::SSL)
 endif()
 
 # Originally, on Windows azure-core is built with winhttp by default
-if (CURL_FOUND)
-    target_link_libraries(_azure_sdk PRIVATE ${CURL_LIBRARY})
+if (TARGET ch_contrib::curl)
+    target_link_libraries(_azure_sdk PRIVATE ch_contrib::curl)
 endif()
 
 target_link_libraries(_azure_sdk PRIVATE ch_contrib::libxml2)
diff --git a/contrib/curl-cmake/CMakeLists.txt b/contrib/curl-cmake/CMakeLists.txt
index 63ac8da24b1..0fe5282b98e 100644
--- a/contrib/curl-cmake/CMakeLists.txt
+++ b/contrib/curl-cmake/CMakeLists.txt
@@ -1,4 +1,7 @@
-if (NOT USE_INTERNAL_CURL)
+option (ENABLE_CURL "Enable curl" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_CURL)
+    message(STATUS "Not using curl")
     return()
 endif()
 
@@ -166,8 +169,6 @@ target_compile_options (curl PRIVATE -g0)
 
 # find_package(CURL) compatibility for the following packages that uses
 # find_package(CURL)/include(FindCURL):
-# - mariadb-connector-c
-# - aws-s3-cmake
 # - sentry-native
 set (CURL_FOUND ON CACHE BOOL "")
 set (CURL_ROOT_DIR ${LIBRARY_DIR} CACHE PATH "")
@@ -176,4 +177,5 @@ set (CURL_INCLUDE_DIRS "${LIBRARY_DIR}/include" CACHE PATH "")
 set (CURL_LIBRARY curl CACHE STRING "")
 set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
 set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
-add_library (CURL::libcurl ALIAS ${CURL_LIBRARY})
+# add_library (CURL::libcurl ALIAS ${CURL_LIBRARY})
+add_library (ch_contrib::curl ALIAS ${CURL_LIBRARY})
diff --git a/contrib/sentry-native-cmake/CMakeLists.txt b/contrib/sentry-native-cmake/CMakeLists.txt
index f4e946cf797..c0936137db0 100644
--- a/contrib/sentry-native-cmake/CMakeLists.txt
+++ b/contrib/sentry-native-cmake/CMakeLists.txt
@@ -47,6 +47,6 @@ else()
     target_compile_definitions(sentry PUBLIC SENTRY_BUILD_STATIC)
 endif()
 
-target_link_libraries(sentry PRIVATE curl pthread)
+target_link_libraries(sentry PRIVATE ch_contrib::curl pthread)
 target_include_directories(sentry PUBLIC "${SRC_DIR}/include" PRIVATE "${SRC_DIR}/src")
 target_compile_definitions(sentry PRIVATE SENTRY_WITH_INPROC_BACKEND SIZEOF_LONG=8)