Merge pull request #568 from carlopi/more_wasm

Fixes connected to duckdb-wasm AND bump vcpkg-duckdb-ports

Author: Maxxen

.github/workflows/MainDistributionPipeline.yml

@@ -26,7 +26,7 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
+      duckdb_version: v1.3-ossivalis
       extension_name: spatial
       ci_tools_version: main
       vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
@@ -38,7 +38,7 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: main
+      duckdb_version: v1.3-ossivalis
       ci_tools_version: main
       extension_name: spatial
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

CMakeLists.txt

@@ -16,6 +16,13 @@ add_definitions(-DDUCKDB_PATCH_VERSION=${DUCKDB_PATCH_VERSION})
 
 # 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)
 

extension_config.cmake

@@ -13,5 +13,5 @@ duckdb_extension_load(spatial
         SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
         INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/spatial
         ${DO_TESTS}
-        LINKED_LIBS "../../deps/local/lib/*.a"
-)
+        LINKED_LIBS "../../vcpkg_installed/wasm32-emscripten/lib/*.a ../../deps/local/lib/*.a"
+)

vcpkg.json

@@ -13,14 +13,11 @@
     }
   ],
   "vcpkg-configuration": {
-    "overlay-ports": [
-      "./vcpkg_ports"
-    ],
     "registries": [
       {
         "kind": "git",
         "repository": "https://github.com/duckdb/vcpkg-duckdb-ports",
-        "baseline": "c8f9d504986e76dbcd4585a34028ff00e251f40f",
+        "baseline": "3c7b96fa186c27eae2226a1b5b292f2b2dd3cf8f",
         "packages": [ "vcpkg-cmake" ]
       }
     ]