From 0ed81f70ec007c4a456c5fc75383d8df9c265d49 Mon Sep 17 00:00:00 2001 From: Mikhail Kot Date: Thu, 11 Jun 2026 11:50:23 +0100 Subject: [PATCH] propagate DUCKDB_SOURCE_DIR to Vortex Signed-off-by: Mikhail Kot --- CMakeLists.txt | 6 ++++-- vortex | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14db1ab..3b4d297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,10 +74,12 @@ corrosion_import_crate( ) # Forward the DuckDB version passed via CMake as an env var. -message(STATUS "Forwarding DUCKDB_VERSION=${DUCKDB_VERSION} to Cargo") +message("Forwarding DUCKDB_VERSION=${DUCKDB_VERSION} to Cargo") +message("Forwarding DUCKDB_SOURCE_DIR=${DUCKDB_MODULE_BASE_DIR} to Cargo") corrosion_set_env_vars( ${VORTEX_RUST_TARGET_NAME} "DUCKDB_VERSION=${DUCKDB_VERSION}" + "DUCKDB_SOURCE_DIR=${DUCKDB_MODULE_BASE_DIR}" ) include_directories(src/include vortex/vortex-duckdb/include vortex/vortex-duckdb/cpp/include) @@ -88,7 +90,7 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension) build_static_extension(${TARGET_NAME} src/vortex_extension.cpp) build_loadable_extension(${TARGET_NAME} "" src/vortex_extension.cpp) -set(VORTEX_WARNING_FLAGS -Wall -Wextra -Wpedantic) +set(VORTEX_WARNING_FLAGS -Wall -Wextra -Wpedantic -Wno-unused-parameter) target_compile_options(${EXTENSION_NAME} PRIVATE ${VORTEX_WARNING_FLAGS}) target_link_libraries(${EXTENSION_NAME} diff --git a/vortex b/vortex index 008c1d9..7b53625 160000 --- a/vortex +++ b/vortex @@ -1 +1 @@ -Subproject commit 008c1d9813b65e179ae8db8a579c8a3e3a1d0e00 +Subproject commit 7b536257e2653c3bd293e12e51ccbcb445534e60