Import TILEDB_CORE_OBJECTS by linking to it, instead of adding its …

…objects as sources. Now that `TILEDB_CORE_OBJECTS` has dependencies on its own, they have to be propagated.
TileDB-Inc · Oct 23, 2023 · dc437bd · dc437bd
1 parent b7797bf
commit dc437bd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -302,6 +302,7 @@ target_include_directories(
 target_link_libraries(tiledb_unit
   PUBLIC
     TILEDB_CORE_OBJECTS_ILIB
+    TILEDB_CORE_OBJECTS
     Catch2::Catch2
     tiledb_test_support_lib
 )

diff --git a/tiledb/api/c_api/array/test/CMakeLists.txt b/tiledb/api/c_api/array/test/CMakeLists.txt
@@ -30,14 +30,14 @@ find_package(Catch_EP REQUIRED)
 # #TODO: link only against a new CAPI array handle, not all core objects
 add_executable(
     unit_capi_array EXCLUDE_FROM_ALL
-    $<TARGET_OBJECTS:TILEDB_CORE_OBJECTS>
 )
 
 target_link_libraries(unit_capi_array
   PUBLIC
     Catch2::Catch2WithMain
     export
     TILEDB_CORE_OBJECTS_ILIB
+    TILEDB_CORE_OBJECTS
 )
 
 # Sources for tests

diff --git a/tiledb/sm/array/test/CMakeLists.txt b/tiledb/sm/array/test/CMakeLists.txt
@@ -33,6 +33,6 @@ conclude(unit_test)
 
 commence(unit_test consistency)
     this_target_sources(main.cc unit_consistency.cc)
-    this_target_sources($<TARGET_OBJECTS:TILEDB_CORE_OBJECTS>)
+    this_target_link_libraries(TILEDB_CORE_OBJECTS)
     this_target_link_libraries(TILEDB_CORE_OBJECTS_ILIB)
 conclude(unit_test)
diff --git a/tiledb/sm/subarray/test/CMakeLists.txt b/tiledb/sm/subarray/test/CMakeLists.txt
@@ -33,7 +33,7 @@ conclude(unit_test)
 
 commence(unit_test add_ranges_list)
     this_target_sources(main.cc unit_add_ranges_list.cc)
-    this_target_link_libraries($<TARGET_OBJECTS:TILEDB_CORE_OBJECTS>)
+    this_target_link_libraries(TILEDB_CORE_OBJECTS)
     this_target_link_libraries(tiledb_test_support_lib)
     target_include_directories(unit_add_ranges_list PRIVATE
         "$<TARGET_PROPERTY:TILEDB_CORE_OBJECTS,INCLUDE_DIRECTORIES>")

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -35,7 +35,6 @@ add_executable(tiledb EXCLUDE_FROM_ALL
   src/commands/help_command.cc
   src/commands/info_command.cc
   src/main/tiledb.cc
-  $<TARGET_OBJECTS:TILEDB_CORE_OBJECTS>
 )
 
 # List of all tool targets
@@ -45,6 +44,7 @@ set(TILEDB_TOOLS tiledb)
 foreach(TOOL ${TILEDB_TOOLS})
   target_link_libraries(${TOOL} PRIVATE
     TILEDB_CORE_OBJECTS_ILIB
+    TILEDB_CORE_OBJECTS
     clipp::clipp
   )
   target_include_directories(${TOOL} PRIVATE