Merge pull request #66136 from rschu1ze/bump-s2

Bump s2geometry again
This commit is contained in:
Robert Schulze 2024-07-05 14:05:31 +00:00 committed by GitHub
commit 72b3ebd180
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions

2
contrib/s2geometry vendored

@ -1 +1 @@
Subproject commit 0146e2d1355828f8f633cb050948250ad7406c57
Subproject commit 6522a40338d58752c2a4227a3fc2bc4107c73e43

View File

@ -1,7 +1,6 @@
option(ENABLE_S2_GEOMETRY "Enable S2 Geometry" ${ENABLE_LIBRARIES})
# ARCH_S390X broke upstream, it can be re-enabled once https://github.com/google/s2geometry/pull/372 is merged
if (NOT ENABLE_S2_GEOMETRY OR ARCH_S390X)
if (NOT ENABLE_S2_GEOMETRY)
message(STATUS "Not using S2 Geometry")
return()
endif()