Update contrib/s2geometry-cmake/CMakeLists.txt

contrib/s2geometry-cmake/CMakeLists.txt

@@ -1,8 +1,12 @@
 set(S2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src")
 
+set(ABSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
+if(NOT EXISTS "${ABSL_SOURCE_DIR}/CMakeLists.txt")
+    message(FATAL_ERROR " submodule contrib/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
+endif()
+
+
 set(S2_SRCS
-    "${S2_SOURCE_DIR}/s2/base/stringprintf.cc"
-    "${S2_SOURCE_DIR}/s2/base/strtoint.cc"
     "${S2_SOURCE_DIR}/s2/encoded_s2cell_id_vector.cc"
     "${S2_SOURCE_DIR}/s2/encoded_s2point_vector.cc"
     "${S2_SOURCE_DIR}/s2/encoded_s2shape_index.cc"
@@ -14,11 +18,14 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/s1chord_angle.cc"
     "${S2_SOURCE_DIR}/s2/s1interval.cc"
     "${S2_SOURCE_DIR}/s2/s2boolean_operation.cc"
+    "${S2_SOURCE_DIR}/s2/s2buffer_operation.cc"
     "${S2_SOURCE_DIR}/s2/s2builder.cc"
     "${S2_SOURCE_DIR}/s2/s2builder_graph.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_closed_set_normalizer.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_find_polygon_degeneracies.cc"
+    "${S2_SOURCE_DIR}/s2/s2builderutil_get_snapped_winding_delta.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_lax_polygon_layer.cc"
+    "${S2_SOURCE_DIR}/s2/s2builderutil_lax_polyline_layer.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_s2point_vector_layer.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_s2polygon_layer.cc"
     "${S2_SOURCE_DIR}/s2/s2builderutil_s2polyline_layer.cc"
@@ -44,7 +51,6 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/s2edge_crossings.cc"
     "${S2_SOURCE_DIR}/s2/s2edge_distances.cc"
     "${S2_SOURCE_DIR}/s2/s2edge_tessellator.cc"
-    "${S2_SOURCE_DIR}/s2/s2error.cc"
     "${S2_SOURCE_DIR}/s2/s2furthest_edge_query.cc"
     "${S2_SOURCE_DIR}/s2/s2latlng.cc"
     "${S2_SOURCE_DIR}/s2/s2latlng_rect.cc"
@@ -55,6 +61,7 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/s2loop.cc"
     "${S2_SOURCE_DIR}/s2/s2loop_measures.cc"
     "${S2_SOURCE_DIR}/s2/s2measures.cc"
+    "${S2_SOURCE_DIR}/s2/s2memory_tracker.cc"
     "${S2_SOURCE_DIR}/s2/s2metrics.cc"
     "${S2_SOURCE_DIR}/s2/s2max_distance_targets.cc"
     "${S2_SOURCE_DIR}/s2/s2min_distance_targets.cc"
@@ -82,28 +89,15 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/s2shapeutil_build_polygon_boundaries.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_coding.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_contains_brute_force.cc"
+    "${S2_SOURCE_DIR}/s2/s2shapeutil_conversion.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_edge_iterator.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_get_reference_point.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_range_iterator.cc"
     "${S2_SOURCE_DIR}/s2/s2shapeutil_visit_crossing_edge_pairs.cc"
     "${S2_SOURCE_DIR}/s2/s2text_format.cc"
     "${S2_SOURCE_DIR}/s2/s2wedge_relations.cc"
-    "${S2_SOURCE_DIR}/s2/strings/ostringstream.cc"
+    "${S2_SOURCE_DIR}/s2/s2winding_operation.cc"
     "${S2_SOURCE_DIR}/s2/strings/serialize.cc"
-    # ClickHouse doesn't use strings from abseil.
-    # So, there is no duplicate symbols.
-    "${S2_SOURCE_DIR}/s2/third_party/absl/base/dynamic_annotations.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/base/internal/raw_logging.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/base/internal/throw_delegate.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/numeric/int128.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/ascii.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/match.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/numbers.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/str_cat.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/str_split.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/string_view.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/strip.cc"
-    "${S2_SOURCE_DIR}/s2/third_party/absl/strings/internal/memutil.cc"
     "${S2_SOURCE_DIR}/s2/util/bits/bit-interleave.cc"
     "${S2_SOURCE_DIR}/s2/util/bits/bits.cc"
     "${S2_SOURCE_DIR}/s2/util/coding/coder.cc"
@@ -111,17 +105,54 @@ set(S2_SRCS
     "${S2_SOURCE_DIR}/s2/util/math/exactfloat/exactfloat.cc"
     "${S2_SOURCE_DIR}/s2/util/math/mathutil.cc"
     "${S2_SOURCE_DIR}/s2/util/units/length-units.cc"
+
+
+    # ClickHouse doesn't use strings from abseil.
+    # So, there is no duplicate symbols.
+#    "${ABSL_SOURCE_DIR}/absl/base/internal/raw_logging.cc"
+#    "${ABSL_SOURCE_DIR}/absl/base/internal/throw_delegate.cc"
+#    "${ABSL_SOURCE_DIR}/absl/numeric/int128.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/ascii.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/match.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/numbers.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/str_cat.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/str_split.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/string_view.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/strip.cc"
+#    "${ABSL_SOURCE_DIR}/absl/strings/internal/memutil.cc"
 )
 
 add_library(s2 ${S2_SRCS})
-
+set_property(TARGET s2 PROPERTY CXX_STANDARD 17)
-set_property(TARGET s2 PROPERTY CXX_STANDARD 11)
 
 if (OPENSSL_FOUND)
     target_link_libraries(s2 PRIVATE ${OPENSSL_LIBRARIES})
 endif()
 
+target_link_libraries(s2 PRIVATE
+        absl::base
+        absl::btree
+        absl::config
+        absl::core_headers
+        absl::dynamic_annotations
+        absl::endian
+        absl::fixed_array
+        absl::flat_hash_map
+        absl::flat_hash_set
+        absl::hash
+        absl::inlined_vector
+        absl::int128
+        absl::log_severity
+        absl::memory
+        absl::span
+        absl::str_format
+        absl::strings
+        absl::type_traits
+        absl::utility
+        )
+
 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})