link error

cmake/find/s2geometry.cmake

@@ -17,4 +17,4 @@ if (ENABLE_S2_GEOMETRY)
     endif()
 endif()
 
-message (STATUS "Using s2geometry=${USE_S2_GEOMETRY} : ${S2_INCLUDE_DIR}")
+message (STATUS "Using s2geometry=${USE_S2_GEOMETRY} : ${S2_GEOMETRY_INCLUDE_DIR}")

contrib/s2geometry-cmake/CMakeLists.txt

@@ -113,7 +113,7 @@ set(S2_SRCS
 
 add_library(s2 ${S2_SRCS})
 
-target_include_directories(s2 PRIVATE "${S2_SOURCE_DIR}/" SYSTEM PUBLIC "${S2_SOURCE_DIR}/")
+target_include_directories(s2 SYSTEM BEFORE PUBLIC "${S2_SOURCE_DIR}/")
 
 if(M_LIBRARY)
     target_link_libraries(s2 PRIVATE ${M_LIBRARY})

src/CMakeLists.txt

@@ -420,8 +420,8 @@ if (USE_AWS_S3)
 endif()
 
 if (USE_S2_GEOMETRY)
-    target_link_libraries (clickhouse_common_io PUBLIC ${S2_GEOMETRY_LIBRARY})
-    target_include_directories (clickhouse_common_io SYSTEM PUBLIC ${S2_GEOMETRY_INCLUDE_DIR})
+    dbms_target_link_libraries (PUBLIC ${S2_GEOMETRY_LIBRARY})
+    dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${S2_GEOMETRY_INCLUDE_DIR})
 endif()
 
 if (USE_BROTLI)

src/Functions/CMakeLists.txt

@@ -126,5 +126,4 @@ endif()
 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 PRIVATE ${S2_INCLUDE_DIR})
-
+target_include_directories(clickhouse_functions SYSTEM PUBLIC ${S2_GEOMETRY_INCLUDE_DIR})

src/Functions/S2CapContains.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2cap.h>
-#include <s2/s1angle.h>
+#include "s2_fwd.h"
 
 namespace DB
 {

src/Functions/S2CapUnion.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2cap.h>
-#include <s2/s1angle.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2CellsIntersect.cpp

@@ -8,8 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2GetNeighbors.cpp

@@ -8,9 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2point.h>
+#include "s2_fwd.h"
 
 namespace DB
 {

src/Functions/S2RectAdd.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2point.h>
-#include <s2/s2latlng_rect.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2RectContains.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2point.h>
-#include <s2/s2latlng_rect.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2RectIntersection.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2point.h>
-#include <s2/s2latlng_rect.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2RectUnion.cpp

@@ -8,10 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
-#include <s2/s2point.h>
-#include <s2/s2latlng_rect.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/S2ToGeo.cpp

@@ -8,8 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include <s2/s2latlng.h>
-#include <s2/s2cell_id.h>
+#include "s2_fwd.h"
 
 class S2CellId;
 

src/Functions/radiansToS2.cpp

@@ -6,8 +6,7 @@
 #include <Common/typeid_cast.h>
 #include <common/range.h>
 
-#include "../contrib/s2geometry/src/s2/s2latlng.h"
-#include "../contrib/s2geometry/src/s2/s2cell_id.h"
+#include "s2_fwd.h"
 
 class S2CellId;
 
@@ -100,7 +99,7 @@ public:
 
 }
 
-void registerRadianssToS2(FunctionFactory & factory)
+void registerFunctionRadiansToS2(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionRadiansToS2>();
 }

src/Functions/s2_fwd.h

@@ -0,0 +1,16 @@
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wambiguous-reversed-operator"
+#endif
+
+#include <s2/s2latlng.h>
+#include <s2/s2cell_id.h>
+#include <s2/s2point.h>
+#include <s2/s2latlng_rect.h>
+#include <s2/s2cap.h>
+#include <s2/s1angle.h>
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif