Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@

# 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)

Expand Down
4 changes: 2 additions & 2 deletions extension_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
5 changes: 1 addition & 4 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
Expand Down
44 changes: 0 additions & 44 deletions vcpkg_ports/expat/portfile.cmake

This file was deleted.

27 changes: 0 additions & 27 deletions vcpkg_ports/expat/vcpkg-cmake-wrapper.cmake

This file was deleted.

17 changes: 0 additions & 17 deletions vcpkg_ports/expat/vcpkg.json

This file was deleted.

Loading