patch s2geography (add include dir for target)

This hopefully fixes s2geography main header file not found when building spherely windows wheels.
benbovy · Sep 5, 2024 · a80053e · a80053e
1 parent c8a9702
commit a80053e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/ci/install_3rdparty.cmd b/ci/install_3rdparty.cmd
@@ -88,9 +88,10 @@ cd %DEPENDENCIES_DIR%
 curl -o s2geography.tar.gz -L https://github.com/paleolimbot/s2geography/archive/refs/tags/%S2GEOGRAPHY_VERSION%.tar.gz
 tar -xf s2geography.tar.gz -C %SRC_DIR%
 
-# TODO: remove when fixed in s2geography
+rem TODO: remove when fixed in s2geography
 cd %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION%
 patch -p1 < %PROJECT_DIR%\ci\s2geography-add-openssl-as-requirement.patch
+patch -p1 < %PROJECT_DIR%\ci\s2geography-add-include-dir.patch
 
 cmake -GNinja ^
     -S %SRC_DIR%/s2geography-%S2GEOGRAPHY_VERSION% ^

diff --git a/ci/install_3rdparty.sh b/ci/install_3rdparty.sh
@@ -104,8 +104,10 @@ build_install_dependencies(){
     cd $SRC_DIR/s2geography-$S2GEOGRAPHY_VERSION
     if [ "$(uname)" == "Darwin" ]; then
         patch -p1 < $PROJECT_DIR/ci/s2geography-add-openssl-as-requirement.patch
+        patch -p1 < $PROJECT_DIR/ci/s2geography-add-include-dir.patch
     else
         patch -p1 < /project/ci/s2geography-add-openssl-as-requirement.patch
+        patch -p1 < /project/ci/s2geography-add-include-dir.patch
     fi
 
     cmake -S $SRC_DIR/s2geography-$S2GEOGRAPHY_VERSION -B $S2GEOGRAPHY_BUILD_DIR \

diff --git a/ci/s2geography-add-include-dir.patch b/ci/s2geography-add-include-dir.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d0d5e56..a520a1f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,6 +212,10 @@ add_library(s2geography
+ set_target_properties(s2geography PROPERTIES
+     POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
+
++target_include_directories(s2geography PUBLIC
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
++  $<INSTALL_INTERFACE:include>)
++
+ target_compile_definitions(
+   s2geography
+   PUBLIC