Skip to content

Commit 03aad8b

Browse files
authored
cmake: get rid of build warnings (#2784)
1 parent d914f92 commit 03aad8b

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

duckdb-vortex/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ FetchContent_MakeAvailable(vcpkg)
2323

2424
# Install vcpkg dependencies.
2525
execute_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
)
3030
set(VCPKG_INSTALL_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed")
3131
file(MAKE_DIRECTORY "${VCPKG_INSTALL_DIR}")
3232
execute_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
)
3636
set(CMAKE_PREFIX_PATH ${VCPKG_INSTALL_DIR}/arm64-osx)

duckdb-vortex/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
33
# Configuration of extension
44
EXT_NAME=vortex_duckdb
55
EXT_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

duckdb-vortex/test/CMakeLists.txt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
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)

0 commit comments

Comments
 (0)