File tree Expand file tree Collapse file tree 3 files changed +19
-14
lines changed
Expand file tree Collapse file tree 3 files changed +19
-14
lines changed Original file line number Diff line number Diff line change @@ -23,14 +23,14 @@ FetchContent_MakeAvailable(vcpkg)
2323
2424# Install vcpkg dependencies.
2525execute_process (
26- COMMAND bash ./bootstrap-vcpkg.sh
26+ COMMAND bash ./bootstrap-vcpkg.sh -disableMetrics
2727 WORKING_DIRECTORY "${vcpkg_SOURCE_DIR} "
2828 RESULT_VARIABLE VCPKG_BOOTSTRAP_RESULT
2929)
3030set (VCPKG_INSTALL_DIR "${CMAKE_BINARY_DIR} /vcpkg_installed" )
3131file (MAKE_DIRECTORY "${VCPKG_INSTALL_DIR} " )
3232execute_process (
33- COMMAND "${vcpkg_SOURCE_DIR} /vcpkg" install --x-install -root=${VCPKG_INSTALL_DIR}
33+ COMMAND "${vcpkg_SOURCE_DIR} /vcpkg" install --no -print-usage -- x-install -root=${VCPKG_INSTALL_DIR}
3434 WORKING_DIRECTORY "${vcpkg_SOURCE_DIR} "
3535)
3636set (CMAKE_PREFIX_PATH ${VCPKG_INSTALL_DIR} /arm64-osx)
Original file line number Diff line number Diff line change @@ -3,6 +3,12 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
33# Configuration of extension
44EXT_NAME =vortex_duckdb
55EXT_CONFIG =${PROJ_DIR}extension_config.cmake
6+ EXT_FLAGS=-DDISABLE_VPTR_SANITIZER =ON -DOVERRIDE_GIT_DESCRIBE=v0.0.0
7+ EXT_FLAGS += -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0
8+
9+ export MACOSX_DEPLOYMENT_TARGET =13.0
10+ export VCPKG_OSX_DEPLOYMENT_TARGET =13.0
11+ export VCPKG_FEATURE_FLAGS =-binarycaching
612
713# Include the Makefile from extension-ci-tools
8- include extension-ci-tools/makefiles/duckdb_extension.Makefile
14+ include extension-ci-tools/makefiles/duckdb_extension.Makefile
Original file line number Diff line number Diff line change 1- include_directories (${CMAKE_SOURCE_DIR} /../src/include )
1+ include_directories (${CMAKE_SOURCE_DIR} /../src/include )
22
3- add_executable (vortex_tests src/expr .cpp)
4- target_include_directories (vortex_tests PRIVATE
5- ${catch2_SOURCE_DIR} /single_include
6- )
3+ add_executable (vortex_tests src/expr .cpp)
4+ target_include_directories (vortex_tests PRIVATE
5+ ${catch2_SOURCE_DIR} /single_include
6+ )
77
8+ target_link_libraries (vortex_tests PRIVATE
9+ ${EXTENSION_NAME}
10+ Catch2::Catch2WithMain)
811
9- target_link_libraries (vortex_tests PRIVATE
10- ${EXTENSION_NAME}
11- Catch2::Catch2WithMain)
12-
13- enable_testing ()
14- add_test (NAME AllTests COMMAND vortex_tests)
12+ enable_testing ()
13+ add_test (NAME AllTests COMMAND vortex_tests)
You can’t perform that action at this time.
0 commit comments