Merge pull request #637 from Maxxen/main-dev

Merge with v1.3.2, apply patches

Author: Maxxen

.github/workflows/MainDistributionPipeline.yml

@@ -21,25 +21,24 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
 
+
 jobs:
   duckdb-latest-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.3-ossivalis
+      duckdb_version: main
       extension_name: spatial
       ci_tools_version: main
-      vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
-      exclude_archs: linux_amd64_musl
+      vcpkg_commit: ce613c41372b23b1f51333815feb3edd87ef8a8b
 
   duckdb-latest-deploy:
     name: Deploy extension binaries
     needs: duckdb-latest-build
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v1.3-ossivalis
+      duckdb_version: main
       ci_tools_version: main
       extension_name: spatial
-      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
-      exclude_archs: linux_amd64_musl
+      deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}

CMakeLists.txt

@@ -6,32 +6,28 @@ set(TARGET_NAME spatial)
 set(EXTENSION_NAME ${TARGET_NAME}_extension)
 set(CMAKE_CXX_STANDARD 11)
 
+if (EMSCRIPTEN)
+  # _LINKED_LIBS influences only Wasm compilation
+  # it's unclear why this is needed, but somehow the global symbol pj_release from PROJ is not properly exported otherwise
+  # this solves by basically re-linking (at the moment the Wasm binary is actually produced)
+  set (DUCKDB_EXTENSION_SPATIAL_LINKED_LIBS "../../vcpkg_installed/wasm32-emscripten/lib/lib*.a")
+endif()
+
 project(${TARGET_NAME})
 
 add_definitions(-DDUCKDB_MAJOR_VERSION=${DUCKDB_MAJOR_VERSION})
 add_definitions(-DDUCKDB_MINOR_VERSION=${DUCKDB_MINOR_VERSION})
 add_definitions(-DDUCKDB_PATCH_VERSION=${DUCKDB_PATCH_VERSION})
+add_definitions(-DDUCKDB_SPATIAL_EXTENSION=1)
 
 # Options
 
 # Enable network functionality (OpenSSL and GDAL's CURL based fs/drivers)
 option(SPATIAL_USE_NETWORK "Enable network functionality" ON)
 
-if (VCPKG_TARGET_IS_EMSCRIPTEN)
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-  set(EMSCRIPTEN ON)
-endif()
-
-
 # Enable GEOS support
 option(SPATIAL_USE_GEOS "Enable GEOS support" ON)
 
-if(EMSCRIPTEN
-   OR IOS
-   OR ANDROID)
-  set(SPATIAL_USE_NETWORK OFF)
-endif()
-
 add_subdirectory(src/spatial)
 add_subdirectory(src/sgl)
 include_directories(src)
@@ -46,70 +42,19 @@ add_subdirectory(src/third_party/shapelib)
 
 add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
 
-# Build dependencies TODO: in the future we should allow users to dynamically
-# link to their own dependencies if they are building locally. If they have a
-# local (compatible) GDAL installation, we should use that instead of building
-# our own. (unless a static build is requested)
-
-if(NOT EXISTS ${CMAKE_BINARY_DIR}/deps)
-  execute_process(
-    # Generate project
-    COMMAND
-      ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}
-      -DENABLE_SANITIZER=${ENABLE_SANITIZER}
-      -DCMAKE_CXX_COMPILER='${CMAKE_CXX_COMPILER}'
-      -DCMAKE_C_COMPILER='${CMAKE_C_COMPILER}' -DDUCKDB_ENABLE_DEPRECATED_API=1
-      -DWASM_LOADABLE_EXTENSIONS=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-      -DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
-      -DSPATIAL_USE_NETWORK=${SPATIAL_USE_NETWORK}
-      -DSPATIAL_USE_GEOS=${SPATIAL_USE_GEOS}
-      -DOPENSSL_ROOT_DIR=$ENV{OPENSSL_ROOT_DIR}
-      -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-      -DVCPKG_INSTALLED_DIR='${CMAKE_BINARY_DIR}/vcpkg_installed'
-      -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-      -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-      -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}' -S
-      ${CMAKE_CURRENT_SOURCE_DIR}/deps -B ${CMAKE_BINARY_DIR}/deps
-    RESULT_VARIABLE DEPENDENCIES_GENERATE_RESULT)
-  if(NOT DEPENDENCIES_GENERATE_RESULT EQUAL 0)
-    message(FATAL_ERROR "Could not generate dependencies project")
-  endif()
-
-  execute_process(
-    # Build project
-    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps --config
-            ${CMAKE_BUILD_TYPE} RESULT_VARIABLE DEPENDENCIES_BUILD_RESULT)
-  if(NOT DEPENDENCIES_BUILD_RESULT EQUAL 0)
-    message(FATAL_ERROR "Could not build dependencies project")
-  endif()
-endif()
-
 # annoyingly for expat on windows
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} MD.lib)
-
-# Add dependencies
-list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_BINARY_DIR}/deps/local/")
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/deps/local/")
-
-message(STATUS "Find libraries path: '${CMAKE_PREFIX_PATH}'")
-
 set(ZLIB_USE_STATIC_LIBS ON)
 set(OPENSSL_USE_STATIC_LIBS ON)
-
-if(EMSCRIPTEN)
-  set(OPENSSL_USE_STATIC_LIBS OFF)
-endif()
-
-find_library(SQLITE3_MEMVFS memvfs)
 find_package(ZLIB REQUIRED)
-find_package(PROJ REQUIRED)
-find_package(SQLite3 REQUIRED)
-find_package(GDAL REQUIRED)
+find_package(PROJ CONFIG REQUIRED)
+find_package(GDAL CONFIG REQUIRED)
 find_package(EXPAT REQUIRED)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
 
 # Important: The link order matters, its the reverse order of dependency
-set(EXTENSION_DEPENDENCIES GDAL::GDAL PROJ::proj EXPAT::EXPAT SQLite::SQLite3
-                           ZLIB::ZLIB ${SQLITE3_MEMVFS})
+set(EXTENSION_DEPENDENCIES GDAL::GDAL PROJ::proj EXPAT::EXPAT unofficial::sqlite3::sqlite3
+                           ZLIB::ZLIB)
 
 if(SPATIAL_USE_GEOS)
   message(STATUS "Building with GEOS functionality")
@@ -118,6 +63,11 @@ if(SPATIAL_USE_GEOS)
   add_definitions(-DSPATIAL_USE_GEOS=1)
 endif()
 
+if(EMSCRIPTEN)
+  message(STATUS "Building for Emscripten, disabling network functionality")
+  set(SPATIAL_USE_NETWORK OFF)
+endif()
+
 if(SPATIAL_USE_NETWORK)
   message(STATUS "Building with network functionality")
   message(STATUS "OpenSSL root dir hint: '$ENV{OPENSSL_ROOT_DIR}'")
@@ -140,7 +90,7 @@ if((NOT EMSCRIPTEN) AND (NOT IOS))
 endif()
 
 # Add dependencies to extension
-target_link_libraries(${EXTENSION_NAME} PUBLIC ${EXTENSION_DEPENDENCIES})
+target_link_libraries(${EXTENSION_NAME} ${EXTENSION_DEPENDENCIES})
 
 # Build extensions
 set(PARAMETERS "-warnings")