Skip to content

Commit 098fcd2

Browse files
authored
fix: don't link vortex ffi dylib into ddb ext (#3126)
1 parent 5e3045f commit 098fcd2

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

duckdb-vortex/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ set(TARGET_NAME vortex)
44
project(${TARGET_NAME}_project)
55

66
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 17)
88

99
include(FetchContent)
1010
FetchContent_Declare(
1111
Corrosion
1212
GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
13-
GIT_TAG v0.5.1
13+
GIT_TAG v0.5.2
1414
)
1515

1616
FetchContent_MakeAvailable(Corrosion)
@@ -25,7 +25,8 @@ endif ()
2525
corrosion_import_crate(MANIFEST_PATH ../Cargo.toml
2626
CRATES vortex-ffi
2727
FEATURES duckdb
28-
IMPORTED_CRATES vortex_ffi
28+
CRATE_TYPES staticlib
29+
FLAGS --crate-type=staticlib
2930
)
3031

3132
set(EXTENSION_NAME ${TARGET_NAME}_extension)
@@ -48,11 +49,6 @@ target_link_libraries(${EXTENSION_NAME}
4849
protobuf::libprotobuf
4950
${SECURITY_FRAMEWORK}
5051
)
51-
target_link_libraries(${LOADABLE_EXTENSION_NAME}
52-
vortex_ffi-shared
53-
protobuf::libprotobuf
54-
${SECURITY_FRAMEWORK}
55-
)
5652

5753
add_subdirectory(test)
5854

0 commit comments

Comments
 (0)