Skip to content

Commit cbd661d

Browse files
committed
link core to puffin & arrow
1 parent 3f6df87 commit cbd661d

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

src/arrow/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ set(ICEBERG_ARROW_STATIC_INSTALL_INTERFACE_LIBS)
2929
set(ICEBERG_ARROW_SHARED_INSTALL_INTERFACE_LIBS)
3030

3131
list(APPEND ICEBERG_ARROW_STATIC_BUILD_INTERFACE_LIBS
32+
"$<IF:$<TARGET_EXISTS:iceberg_core_static>,iceberg_core_static,iceberg_core_shared>"
3233
"$<IF:$<TARGET_EXISTS:Arrow::arrow_static>,Arrow::arrow_static,Arrow::arrow_shared>")
3334
list(APPEND ICEBERG_ARROW_SHARED_BUILD_INTERFACE_LIBS
35+
"$<IF:$<TARGET_EXISTS:iceberg_core_shared>,iceberg_core_shared,iceberg_core_static>"
3436
"$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>")
3537

3638
if(ARROW_VENDORED)

src/puffin/CMakeLists.txt

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,38 @@
1818
set(ICEBERG_PUFFIN_SOURCES demo_puffin.cc)
1919
set(ICEBERG_PUFFIN_INCLUDES "${ICEBERG_API_DIR}")
2020

21+
set(ICEBERG_PUFFIN_STATIC_BUILD_INTERFACE_LIBS)
22+
set(ICEBERG_PUFFIN_SHARED_BUILD_INTERFACE_LIBS)
23+
set(ICEBERG_PUFFIN_STATIC_INSTALL_INTERFACE_LIBS)
24+
set(ICEBERG_PUFFIN_SHARED_INSTALL_INTERFACE_LIBS)
25+
26+
list(APPEND ICEBERG_PUFFIN_STATIC_BUILD_INTERFACE_LIBS
27+
"$<IF:$<TARGET_EXISTS:iceberg_core_static>,iceberg_core_static,iceberg_core_shared>")
28+
list(APPEND ICEBERG_PUFFIN_SHARED_BUILD_INTERFACE_LIBS
29+
"$<IF:$<TARGET_EXISTS:iceberg_core_shared>,iceberg_core_shared,iceberg_core_static>")
30+
list(APPEND
31+
ICEBERG_PUFFIN_STATIC_INSTALL_INTERFACE_LIBS
32+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_core_static>,Iceberg::iceberg_core_static,Iceberg::iceberg_core_shared>"
33+
)
34+
list(APPEND
35+
ICEBERG_PUFFIN_SHARED_INSTALL_INTERFACE_LIBS
36+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_core_shared>,Iceberg::iceberg_core_shared,Iceberg::iceberg_core_static>"
37+
)
38+
2139
add_iceberg_lib(iceberg_puffin
2240
SOURCES
2341
${ICEBERG_PUFFIN_SOURCES}
2442
OUTPUTS
2543
ICEBERG_PUFFIN_LIBRARIES
2644
PRIVATE_INCLUDES
27-
${ICEBERG_PUFFIN_INCLUDES})
45+
${ICEBERG_PUFFIN_INCLUDES}
46+
SHARED_LINK_LIBS
47+
${ICEBERG_PUFFIN_SHARED_BUILD_INTERFACE_LIBS}
48+
STATIC_LINK_LIBS
49+
${ICEBERG_PUFFIN_STATIC_BUILD_INTERFACE_LIBS}
50+
STATIC_INSTALL_INTERFACE_LIBS
51+
${ICEBERG_PUFFIN_STATIC_INSTALL_INTERFACE_LIBS}
52+
SHARED_INSTALL_INTERFACE_LIBS
53+
${ICEBERG_PUFFIN_SHARED_INSTALL_INTERFACE_LIBS})
2854

2955
iceberg_set_export_definitions(iceberg_puffin_static "${ICEBERG_PUFFIN_LIBRARIES}")

0 commit comments

Comments
 (0)