Skip to content

Commit 450094c

Browse files
authored
Merge pull request #568 from carlopi/more_wasm
Fixes connected to duckdb-wasm AND bump vcpkg-duckdb-ports
2 parents 494d949 + 7d5bb26 commit 450094c

File tree

7 files changed

+12
-96
lines changed

7 files changed

+12
-96
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: Build extension binaries
2727
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
2828
with:
29-
duckdb_version: main
29+
duckdb_version: v1.3-ossivalis
3030
extension_name: spatial
3131
ci_tools_version: main
3232
vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
@@ -38,7 +38,7 @@ jobs:
3838
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
3939
secrets: inherit
4040
with:
41-
duckdb_version: main
41+
duckdb_version: v1.3-ossivalis
4242
ci_tools_version: main
4343
extension_name: spatial
4444
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ add_definitions(-DDUCKDB_PATCH_VERSION=${DUCKDB_PATCH_VERSION})
1616

1717
# Enable network functionality (OpenSSL and GDAL's CURL based fs/drivers)
1818
option(SPATIAL_USE_NETWORK "Enable network functionality" ON)
19+
20+
if (VCPKG_TARGET_IS_EMSCRIPTEN)
21+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
22+
set(EMSCRIPTEN ON)
23+
endif()
24+
25+
1926
# Enable GEOS support
2027
option(SPATIAL_USE_GEOS "Enable GEOS support" ON)
2128

extension_config.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ duckdb_extension_load(spatial
1313
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
1414
INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/spatial
1515
${DO_TESTS}
16-
LINKED_LIBS "../../deps/local/lib/*.a"
17-
)
16+
LINKED_LIBS "../../vcpkg_installed/wasm32-emscripten/lib/*.a ../../deps/local/lib/*.a"
17+
)

vcpkg.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313
}
1414
],
1515
"vcpkg-configuration": {
16-
"overlay-ports": [
17-
"./vcpkg_ports"
18-
],
1916
"registries": [
2017
{
2118
"kind": "git",
2219
"repository": "https://github.com/duckdb/vcpkg-duckdb-ports",
23-
"baseline": "c8f9d504986e76dbcd4585a34028ff00e251f40f",
20+
"baseline": "3c7b96fa186c27eae2226a1b5b292f2b2dd3cf8f",
2421
"packages": [ "vcpkg-cmake" ]
2522
}
2623
]

vcpkg_ports/expat/portfile.cmake

Lines changed: 0 additions & 44 deletions
This file was deleted.

vcpkg_ports/expat/vcpkg-cmake-wrapper.cmake

Lines changed: 0 additions & 27 deletions
This file was deleted.

vcpkg_ports/expat/vcpkg.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)