From c6bb08d33878d04efcfd5e3f3fa84fa15102d1a0 Mon Sep 17 00:00:00 2001
From: Junwang Zhao <zhjwpku@gmail.com>
Date: Wed, 6 May 2026 08:46:05 +0800
Subject: [PATCH] fix(cmake): be consistent with generator expressions

also resolves a comment left in #635

https://github.com/apache/iceberg-cpp/pull/635#discussion_r3178277652
---
 example/CMakeLists.txt          | 6 ++++--
 src/iceberg/test/CMakeLists.txt | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index f89058ed5..a9bf73cf0 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -26,5 +26,7 @@ find_package(iceberg CONFIG REQUIRED COMPONENTS bundle rest)
 
 add_executable(demo_example demo_example.cc)
 
-target_link_libraries(demo_example PRIVATE iceberg::iceberg_bundle_shared
-                                           iceberg::iceberg_rest_shared)
+target_link_libraries(demo_example
+                      PRIVATE "$<IF:$<TARGET_EXISTS:iceberg::iceberg_bundle_shared>,iceberg::iceberg_bundle_shared,iceberg::iceberg_bundle_static>"
+                              "$<IF:$<TARGET_EXISTS:iceberg::iceberg_rest_shared>,iceberg::iceberg_rest_shared,iceberg::iceberg_rest_static>"
+)
diff --git a/src/iceberg/test/CMakeLists.txt b/src/iceberg/test/CMakeLists.txt
index 3355dacf7..6b98951ad 100644
--- a/src/iceberg/test/CMakeLists.txt
+++ b/src/iceberg/test/CMakeLists.txt
@@ -46,13 +46,17 @@ function(add_iceberg_test test_name)
   target_sources(${test_name} PRIVATE ${ARG_SOURCES})
 
   if(ARG_USE_BUNDLE)
-    target_link_libraries(${test_name} PRIVATE iceberg_bundle_static GTest::gmock_main)
+    target_link_libraries(${test_name}
+                          PRIVATE "$<IF:$<TARGET_EXISTS:iceberg_bundle_static>,iceberg_bundle_static,iceberg_bundle_shared>"
+                                  GTest::gmock_main)
   elseif(ARG_USE_DATA)
     target_link_libraries(${test_name}
                           PRIVATE "$<IF:$<TARGET_EXISTS:iceberg_data_static>,iceberg_data_static,iceberg_data_shared>"
                                   GTest::gmock_main)
   else()
-    target_link_libraries(${test_name} PRIVATE iceberg_static GTest::gmock_main)
+    target_link_libraries(${test_name}
+                          PRIVATE "$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>"
+                                  GTest::gmock_main)
   endif()
 
   if(MSVC_TOOLCHAIN)