From 94ba901fbd40e2a58cb7e779b3b705dd8a721cbc Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 17 Jan 2022 08:53:49 +0300
Subject: [PATCH] Remove unbundled s2geometry support

---
 CMakeLists.txt                          |  1 -
 cmake/find/s2geometry.cmake             | 24 ------------------------
 contrib/s2geometry-cmake/CMakeLists.txt | 23 ++++++++++++++++-------
 src/CMakeLists.txt                      |  5 ++---
 src/Functions/CMakeLists.txt            |  3 ---
 5 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 cmake/find/s2geometry.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15ab3351a4f..fb845eccb4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,7 +527,6 @@ include (cmake/find/sqlite.cmake)
 include (cmake/find/libpqxx.cmake)
 include (cmake/find/nuraft.cmake)
 include (cmake/find/yaml-cpp.cmake)
-include (cmake/find/s2geometry.cmake)
 include (cmake/find/nlp.cmake)
 include (cmake/find/filelog.cmake)
 include (cmake/find/msgpack.cmake)
diff --git a/cmake/find/s2geometry.cmake b/cmake/find/s2geometry.cmake
deleted file mode 100644
index ccbf72e0c41..00000000000
--- a/cmake/find/s2geometry.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-
-option(ENABLE_S2_GEOMETRY "Enable S2 geometry library" ${ENABLE_LIBRARIES})
-
-if (ENABLE_S2_GEOMETRY)
-    if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/s2geometry")
-        message (WARNING "submodule contrib/s2geometry is missing. to fix try run: \n git submodule update --init")
-        set (ENABLE_S2_GEOMETRY 0)
-        set (USE_S2_GEOMETRY 0)
-    else()
-        #if (TARGET OpenSSL::SSL)
-            set (S2_GEOMETRY_LIBRARY s2)
-            set (S2_GEOMETRY_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src/s2)
-            set (USE_S2_GEOMETRY 1)
-        #else()
-        #    message (WARNING "S2 uses OpenSSL, but the latter is absent.")
-        #endif()
-    endif()
-
-    if (NOT USE_S2_GEOMETRY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable S2 geometry library")
-    endif()
-endif()
-
-message (STATUS "Using s2geometry=${USE_S2_GEOMETRY} : ${S2_GEOMETRY_INCLUDE_DIR}")
diff --git a/contrib/s2geometry-cmake/CMakeLists.txt b/contrib/s2geometry-cmake/CMakeLists.txt
index e5177689953..49c80e45b18 100644
--- a/contrib/s2geometry-cmake/CMakeLists.txt
+++ b/contrib/s2geometry-cmake/CMakeLists.txt
@@ -1,3 +1,10 @@
+option(ENABLE_S2_GEOMETRY "Enable S2 geometry library" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_S2_GEOMETRY)
+    message(STATUS "Not using S2 geometry")
+    return()
+endif()
+
 set(S2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src")
 
 set(ABSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
@@ -108,15 +115,17 @@ set(S2_SRCS
 
 )
 
-add_library(s2 ${S2_SRCS})
-set_property(TARGET s2 PROPERTY CXX_STANDARD 17)
+add_library(_s2 ${S2_SRCS})
+add_library(ch_contrib::s2 ALIAS _s2)
+
+set_property(TARGET _s2 PROPERTY CXX_STANDARD 17)
 
 if (TARGET OpenSSL::SSL)
-    target_link_libraries(s2 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+    target_link_libraries(_s2 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
 endif()
 
 # Copied from contrib/s2geometry/CMakeLists
-target_link_libraries(s2 PRIVATE
+target_link_libraries(_s2 PRIVATE
         absl::base
         absl::btree
         absl::config
@@ -138,9 +147,9 @@ target_link_libraries(s2 PRIVATE
         absl::utility
         )
 
-target_include_directories(s2 SYSTEM BEFORE PUBLIC "${S2_SOURCE_DIR}/")
-target_include_directories(s2 SYSTEM PUBLIC "${ABSL_SOURCE_DIR}")
+target_include_directories(_s2 SYSTEM BEFORE PUBLIC "${S2_SOURCE_DIR}/")
+target_include_directories(_s2 SYSTEM PUBLIC "${ABSL_SOURCE_DIR}")
 
 if(M_LIBRARY)
-    target_link_libraries(s2 PRIVATE ${M_LIBRARY})
+    target_link_libraries(_s2 PRIVATE ${M_LIBRARY})
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d362dbe0b9b..9f8e675972a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -457,9 +457,8 @@ if (USE_AZURE_BLOB_STORAGE)
     target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${AZURE_SDK_INCLUDES})
 endif()
 
-if (USE_S2_GEOMETRY)
-    dbms_target_link_libraries (PUBLIC ${S2_GEOMETRY_LIBRARY})
-    dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${S2_GEOMETRY_INCLUDE_DIR})
+if (TARGET ch_contrib::s2)
+    dbms_target_link_libraries (PUBLIC ch_contrib::s2)
 endif()
 
 if (USE_BROTLI)
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index 623e3dfee29..f0620fe4bc8 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -121,9 +121,6 @@ add_subdirectory(JSONPath)
 # Signed integer overflow on user-provided data inside boost::geometry - ignore.
 set_source_files_properties("pointInPolygon.cpp" PROPERTIES COMPILE_FLAGS -fno-sanitize=signed-integer-overflow)
 
-# target_link_libraries(clickhouse_functions PRIVATE ${S2_LIBRARY})
-target_include_directories(clickhouse_functions SYSTEM PUBLIC ${S2_GEOMETRY_INCLUDE_DIR})
-
 if (ENABLE_FUZZING)
     add_compile_definitions(FUZZING_MODE=1)
 endif ()