wip

Author: 0ax1

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "duckdb"]
 	path = duckdb
 	url = https://github.com/spiraldb/duckdb.git
+[submodule "vcpkg"]
+	path = vcpkg
+	url = [email protected]:microsoft/vcpkg.git

CMakeLists.txt

@@ -12,34 +12,8 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
     GIT_TAG v0.5.1
 )
-FetchContent_Declare(
-    vcpkg
-    GIT_REPOSITORY https://github.com/microsoft/vcpkg.git
-    GIT_TAG 2025.03.19
-)
-FetchContent_MakeAvailable(Corrosion)
-FetchContent_MakeAvailable(vcpkg)
-
-# Install vcpkg dependencies.
-execute_process(
-    COMMAND bash ./bootstrap-vcpkg.sh -disableMetrics
-    WORKING_DIRECTORY "${vcpkg_SOURCE_DIR}"
-    RESULT_VARIABLE VCPKG_BOOTSTRAP_RESULT
-)
-set(VCPKG_INSTALL_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed")
-file(MAKE_DIRECTORY "${VCPKG_INSTALL_DIR}")
-execute_process(
-    COMMAND "${vcpkg_SOURCE_DIR}/vcpkg" install --no-print-usage --x-manifest-root=${CMAKE_CURRENT_SOURCE_DIR}/vcpkg --x-install-root=${VCPKG_INSTALL_DIR}
-    WORKING_DIRECTORY "${vcpkg_SOURCE_DIR}"
-)
 
-if (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
-    set(CMAKE_PREFIX_PATH ${VCPKG_INSTALL_DIR}/arm64-osx)
-elseif (APPLE)
-    set(CMAKE_PREFIX_PATH ${VCPKG_INSTALL_DIR}/x64-osx)
-elseif (UNIX AND NOT APPLE)
-    set(CMAKE_PREFIX_PATH ${VCPKG_INSTALL_DIR}/x64-linux)
-endif ()
+FetchContent_MakeAvailable(Corrosion)
 
 find_package(Catch2 CONFIG REQUIRED)
 find_package(Protobuf CONFIG REQUIRED)
@@ -49,7 +23,6 @@ if (APPLE)
 endif ()
 
 corrosion_import_crate(MANIFEST_PATH vortex/Cargo.toml
-#    CORROSION_TOOLS_RUST_TOOLCHAIN "nightly-2025-02-24"
     CRATES vortex-ffi
     FEATURES duckdb
     IMPORTED_CRATES vortex_ffi

Makefile

@@ -1,6 +1,5 @@
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-# Configuration of extension
 EXT_NAME=vortex_duckdb
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 EXT_FLAGS=-DDISABLE_VPTR_SANITIZER=ON -DOVERRIDE_GIT_DESCRIBE=v1.2.2
@@ -9,6 +8,7 @@ EXT_FLAGS += -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0
 export MACOSX_DEPLOYMENT_TARGET=13.0
 export VCPKG_OSX_DEPLOYMENT_TARGET=13.0
 export VCPKG_FEATURE_FLAGS=-binarycaching
+export VCPKG_TOOLCHAIN_PATH := ${PROJ_DIR}vcpkg/scripts/buildsystems/vcpkg.cmake
 
 # Include the Makefile from extension-ci-tools
 include extension-ci-tools/makefiles/duckdb_extension.Makefile

vcpkg

@@ -1 +1,3 @@
-{}
+{
+  "dependencies": [{ "name": "catch2" }, { "name": "protobuf" }]
+}