Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
}

# CMake exits with non-0 status if there are any warnings during the build, so
cmake --build $env:BUILD_BUILDDIRECTORY -j --target tiledb_unit unit_vfs tiledb_regression all_link_complete --config $CMakeBuildType
cmake --build $env:BUILD_BUILDDIRECTORY -j --target tiledb_unit unit_vfs tiledb_regression --config $CMakeBuildType

if ($env:TILEDB_AZURE -eq "ON") {
if($env.TILEDB_USE_CUSTOM_NODE_JS) {
Expand Down
31 changes: 2 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -483,32 +483,13 @@ if(TILEDB_TESTS)
endif()

# -------------------------------------------------------
# Accumulators for object libraries and unit tests
# Accumulators for unit tests
# -------------------------------------------------------
#
# All link-completeness targets from object libraries are aggregated onto a
# single target.
#
# 1. Before any subdirectories are added:
# a) Declare a target for all link-completeness checks. It's a phantom target
# having only dependencies and with no build actions of its own.
# b) Declare an accumulator for link-completeness targets.
# 2. For each object library within the various subdirectories, add a
# link-completeness target, either
# a) manually, as an explicit dependency of the `all_link_complete` target.
# b) automatically, as an implicit part of an object library environment.
# The environment puts the link-completess target into the accumulator.
# 3. After all the subdirectories are added:
# a) The list of all targets from the accumulator is added as a dependency
# of `all_link_complete`.
#
# All unit tests are similarly aggregated onto the target `all_unit_tests`.
# All unit tests are aggregated onto the target `all_unit_tests`.
#
include(accumulator)

add_custom_target(all_link_complete)
define_accumulator(object_library_compile_targets)

define_accumulator(unit_test_targets)
#
# This is the legacy position of this target declaration; it should appear in
Expand Down Expand Up @@ -592,14 +573,6 @@ if (TILEDB_TESTS)
)
endif()

# -------------------------------------------------------
#
# All the compile-targets from object library definitions are dependencies of
# the `all_link_complete` phantom target.
#
retrieve_from(Compile_Targets ACCUMULATOR object_library_compile_targets)
add_dependencies(all_link_complete ${Compile_Targets})

###########################################################
# Uninstall
###########################################################
Expand Down
14 changes: 0 additions & 14 deletions cmake/object_library.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,6 @@ macro(TileDB_Environment_object_library_end)
#
#target_link_libraries(${TileDB_Environment_object_library_end_Library} PUBLIC configuration_definitions)

# Compile test
add_executable(${TileDB_Environment_object_library_end_Compile} EXCLUDE_FROM_ALL)
target_link_libraries(${TileDB_Environment_object_library_end_Compile} PRIVATE ${TileDB_Environment_object_library_end_Library})
# Link assert since it is used everywhere (good)
target_link_libraries(${TileDB_Environment_object_library_end_Compile} PRIVATE assert)
# There must be a file named `test/compile_<object_library>_main.cc` for each object library.
# TODO: Add explicit check for missing `..._main.cc` file.
target_sources(${TileDB_Environment_object_library_end_Compile} PRIVATE
test/${TileDB_Environment_object_library_end_Compile}_main.cc $<TARGET_OBJECTS:${TileDB_Environment_object_library_end_Library}>
)
# Append the current link-complete compile target to the complete list of them
put_into(ACCUMULATOR object_library_compile_targets LIST ${TileDB_Environment_object_library_end_Compile})
# ----------------------------------

message(${TileDB_Environment_object_library_end_Log_Level} "<<< object-library conclude end <<<")
endmacro()

Expand Down
2 changes: 1 addition & 1 deletion cmake/unit_test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ macro(TileDB_Environment_unit_test_end)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

# Append the current link-complete compile target to the complete list of them
# Append the current unit test target to the complete list of them
put_into(ACCUMULATOR unit_test_targets LIST ${TileDB_Environment_unit_test_end_Unit_Test})
# ----------------------------------

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/build_libtiledb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ cmake --build . -j4 --target install

ls -la

cmake --build . -j4 --target tiledb_unit unit_vfs tiledb_regression all_link_complete
cmake --build . -j4 --target tiledb_unit unit_vfs tiledb_regression
34 changes: 0 additions & 34 deletions test/support/test/compile_mem_helpers_main.cc

This file was deleted.

34 changes: 0 additions & 34 deletions test/support/test/compile_tdb_catch_main.cc

This file was deleted.

35 changes: 0 additions & 35 deletions tiledb/api/c_api/array/test/compile_capi_array_stub_main.cc

This file was deleted.

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions tiledb/api/c_api/buffer/test/compile_capi_buffer_stub_main.cc

This file was deleted.

This file was deleted.

34 changes: 0 additions & 34 deletions tiledb/api/c_api/config/test/compile_capi_config_stub_main.cc

This file was deleted.

Loading
Loading