Skip to content

Commit a1c89a7

Browse files
committed
wip
1 parent 7f48b0c commit a1c89a7

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FetchContent_MakeAvailable(Corrosion)
1818
find_package(Catch2 CONFIG REQUIRED)
1919
find_package(Protobuf CONFIG REQUIRED)
2020
if (APPLE)
21-
find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation)
2221
find_library(SECURITY_FRAMEWORK Security)
2322
endif ()
2423

@@ -46,13 +45,11 @@ build_loadable_extension(${TARGET_NAME} ${EXTENSION_SOURCES} ${PROTO_SRCS})
4645
target_link_libraries(${EXTENSION_NAME}
4746
vortex_ffi-static
4847
protobuf::libprotobuf
49-
${CORE_FOUNDATION_FRAMEWORK}
5048
${SECURITY_FRAMEWORK}
5149
)
5250
target_link_libraries(${LOADABLE_EXTENSION_NAME}
5351
vortex_ffi-shared
5452
protobuf::libprotobuf
55-
${CORE_FOUNDATION_FRAMEWORK}
5653
${SECURITY_FRAMEWORK}
5754
)
5855

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
22

33
EXT_NAME=vortex_duckdb
44
EXT_CONFIG=${PROJ_DIR}extension_config.cmake
5-
EXT_FLAGS=-DDISABLE_VPTR_SANITIZER=ON -DOVERRIDE_GIT_DESCRIBE=v1.2.2
6-
EXT_FLAGS += -DCMAKE_OSX_DEPLOYMENT_TARGET=13.0
5+
EXT_FLAGS=-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DOVERRIDE_GIT_DESCRIBE=v1.2.2
76

8-
export MACOSX_DEPLOYMENT_TARGET=13.0
9-
export VCPKG_OSX_DEPLOYMENT_TARGET=13.0
7+
export MACOSX_DEPLOYMENT_TARGET=12.0
8+
export VCPKG_OSX_DEPLOYMENT_TARGET=12.0
109
export VCPKG_FEATURE_FLAGS=-binarycaching
1110
export VCPKG_TOOLCHAIN_PATH := ${PROJ_DIR}vcpkg/scripts/buildsystems/vcpkg.cmake
1211

13-
# Include the Makefile from extension-ci-tools
1412
include extension-ci-tools/makefiles/duckdb_extension.Makefile

0 commit comments

Comments
 (0)