Skip to content

Commit

Permalink
if building Boost from source, ta_test depends on Boost::unit_test_fr…
Browse files Browse the repository at this point in the history
…amework target whose building is a saga ... bump VG CMake kit to support building such Boost components (for which component != target) from source
  • Loading branch information
evaleev committed Jan 25, 2024
1 parent 1bd5517 commit 5c8230e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
- Boost.Container: header-only
- Boost.Test: header-only or (optionally) as a compiled library, *only used for unit testing*
- Boost.Range: header-only, *only used for unit testing*
- [BTAS](http://github.com/ValeevGroup/BTAS), tag b2c18c797122b149eb088ae494dbd12f2f5ff81b . If usable BTAS installation is not found, TiledArray will download and compile
- [BTAS](http://github.com/ValeevGroup/BTAS), tag ef7346e153d58f5efb2062aae0428ccd79dd552b . If usable BTAS installation is not found, TiledArray will download and compile
BTAS from source. *This is the recommended way to compile BTAS for all users*.
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 87715d98a244bff5cbff0bd2c644a8a00d882989 .
Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
Expand Down
5 changes: 5 additions & 0 deletions external/boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ set(required_components
random # TA, BTAS
tuple # TA
)
if (BUILD_TESTING)
list(APPEND required_components
test # TA
)
endif()
if (DEFINED Boost_REQUIRED_COMPONENTS)
list(APPEND Boost_REQUIRED_COMPONENTS
${required_components})
Expand Down
6 changes: 3 additions & 3 deletions external/versions.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# for each dependency track both current and previous id (the variable for the latter must contain PREVIOUS)
# to be able to auto-update them

set(TA_TRACKED_VGCMAKEKIT_TAG 45e7d0d8d7f994a88c5af5fc082332db7bd0d6b3)
set(TA_TRACKED_VGCMAKEKIT_TAG 38f99f3da4810c97ed1d54f863120ae85120fa8f)

# N.B. may need to update INSTALL.md manually with the CUDA-specific version
set(TA_TRACKED_EIGEN_VERSION 3.3.5)
Expand All @@ -16,8 +16,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG 39de6cb4d262b3df1f67b3c04a37a935564ca657)
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

set(TA_TRACKED_BTAS_TAG b2c18c797122b149eb088ae494dbd12f2f5ff81b)
set(TA_TRACKED_BTAS_PREVIOUS_TAG 85eea7796651de1bcb4781b0081a352b32bf91d5)
set(TA_TRACKED_BTAS_TAG ef7346e153d58f5efb2062aae0428ccd79dd552b)
set(TA_TRACKED_BTAS_PREVIOUS_TAG b2c18c797122b149eb088ae494dbd12f2f5ff81b)

set(TA_TRACKED_LIBRETT_TAG 6eed30d4dd2a5aa58840fe895dcffd80be7fbece)
set(TA_TRACKED_LIBRETT_PREVIOUS_TAG 354e0ccee54aeb2f191c3ce2c617ebf437e49d83)
Expand Down
4 changes: 4 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ if (NOT (TA_ASSERT_POLICY STREQUAL TA_ASSERT_THROW) AND NOT CUDA_FOUND AND FALSE
else()
add_ta_executable(${executable} "${ta_test_src_files}" "tiledarray")
endif()
# if Boost is modularized, need to explicitly state that we need Boost::test module
if (Boost_IS_MODULARIZED)
target_link_libraries(${executable} PRIVATE Boost::unit_test_framework)
endif()
# Add include directories and compiler flags for ta_test
target_include_directories(${executable} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
Expand Down

0 comments on commit 5c8230e

Please sign in to comment.