update to v0.10.3, enable building on IOS

.github/workflows/StableDistributionPipeline.yml

@@ -5,13 +5,13 @@ name: Stable Extension Distribution Pipeline
 on:
   pull_request:
     branches:
-      - v0.10.2
+      - v0.10.3
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
   push:
     branches:
-      - v0.10.2
+      - v0.10.3
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
@@ -24,17 +24,17 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/[email protected].2
+    uses: duckdb/extension-ci-tools/.github/workflows/[email protected].3
     with:
-      duckdb_version: v0.10.2
+      duckdb_version: v0.10.3
       extension_name: spatial
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/[email protected].2
+    uses: duckdb/extension-ci-tools/.github/workflows/[email protected].3
     secrets: inherit
     with:
-      duckdb_version: v0.10.2
+      duckdb_version: v0.10.3
       extension_name: spatial
-      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v0.10.2' }}
+      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v0.10.3' }}

CMakeLists.txt

@@ -17,7 +17,7 @@
 # Enable network functionality (OpenSSL and GDAL's CURL based fs/drivers)
 option(SPATIAL_USE_NETWORK "Enable network functionality" ON)
 
-if (EMSCRIPTEN)
+if (EMSCRIPTEN OR IOS OR ANDROID)
   set(SPATIAL_USE_NETWORK OFF)
 endif()
 
@@ -119,7 +119,7 @@
   list(APPEND EXTENSION_DEPENDENCIES wbemuuid.lib)
 endif()
 
-if(NOT EMSCRIPTEN)
+if((NOT EMSCRIPTEN) AND (NOT IOS))
   if(APPLE)
     find_library(CoreFoundation_Library CoreFoundation)
     find_library(SystemConfiguration_Library SystemConfiguration)

deps/CMakeLists.txt

@@ -54,7 +54,9 @@ ExternalProject_Add(
     -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
     -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
 )
-if (EMSCRIPTEN)
+
+# Use the system sqlite binary on Emscripten, iOS and Android
+if (EMSCRIPTEN OR IOS OR ANDROID)
   find_program(EXE_SQLITE3 sqlite3)
 endif()
 set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} ZLIB)

deps/patches/geographiclib.patch

@@ -0,0 +1,22 @@
+--- /CMakeLists.txt	2024-05-23 13:22:05
++++ /CMakeLists.txt	2024-05-23 13:26:44
+@@ -452,8 +452,8 @@
+ endif ()
+
+ # The list of tools (to be installed into, e.g., /usr/local/bin)
+-set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve
+-  GeoidEval Gravity MagneticField Planimeter RhumbSolve TransverseMercatorProj)
++#set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve
++#  GeoidEval Gravity MagneticField Planimeter RhumbSolve TransverseMercatorProj)
+ # The list of scripts (to be installed into, e.g., /usr/local/sbin)
+ set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity
+   geographiclib-get-magnetic)
+@@ -463,7 +463,7 @@
+ # The list of subdirectories to process
+ add_subdirectory (src)
+ add_subdirectory (include/GeographicLib)
+-add_subdirectory (tools)
++#add_subdirectory (tools)
+ add_subdirectory (man)
+ add_subdirectory (doc)
+ if (EXAMPLEDIR)

deps/vendor/sqlite3/CMakeLists.txt

@@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 3.20)
 include_directories(${CMAKE_SOURCE_DIR}/src)
 add_library(sqlite3 STATIC src/sqlite3.c src/sqlite3.h src/sqlite3ext.h)
 add_library(memvfs STATIC src/memvfs.c src/sqlite3ext.h)
-add_executable(sqlite src/sqlite3.c src/shell.c src/sqlite3.h src/sqlite3ext.h)
-set_target_properties(sqlite PROPERTIES OUTPUT_NAME sqlite3)
 
 # Enable the SQLITE_USE_URI compile-time option
 add_definitions(-DSQLITE_USE_URI=1)
@@ -21,17 +19,21 @@ target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_COLUMN_METADATA=1)
 target_compile_definitions(sqlite3 PUBLIC SQLITE_USE_URI=1)
 target_compile_definitions(sqlite3 PUBLIC SQLITE_TEMP_STORE=3)
 
-find_package(Threads REQUIRED)
-target_link_libraries(sqlite PUBLIC Threads::Threads)
-find_library(MATH_LIBRARY m)
-if(MATH_LIBRARY)
-    target_link_libraries(sqlite PUBLIC ${MATH_LIBRARY})
-endif()
-if(CMAKE_DL_LIBS)
-  target_link_libraries(sqlite PUBLIC ${CMAKE_DL_LIBS})
+if((NOT IOS) AND (NOT ANDROID))
+  add_executable(sqlite src/sqlite3.c src/shell.c src/sqlite3.h src/sqlite3ext.h)
+  set_target_properties(sqlite PROPERTIES OUTPUT_NAME sqlite3)
+  find_package(Threads REQUIRED)
+  target_link_libraries(sqlite PUBLIC Threads::Threads)
+  find_library(MATH_LIBRARY m)
+  if(MATH_LIBRARY)
+      target_link_libraries(sqlite PUBLIC ${MATH_LIBRARY})
+  endif()
+  if(CMAKE_DL_LIBS)
+    target_link_libraries(sqlite PUBLIC ${CMAKE_DL_LIBS})
+  endif()
+  install(TARGETS sqlite RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
 endif()
 
-install(TARGETS sqlite RUNTIME DESTINATION bin)
 install(FILES src/sqlite3.h src/sqlite3ext.h DESTINATION include)
 install(TARGETS sqlite3 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 install(TARGETS memvfs LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)