Skip to content

Commit

Permalink
Merge pull request TESSEorg#309 from TESSEorg/evaleev/cmake/parsec-wo…
Browse files Browse the repository at this point in the history
…-boost-serialization

[cmake] ttg-parsec w/o Boost serialization can be built even if `Boost::serialization` target is found
  • Loading branch information
evaleev authored Nov 20, 2024
2 parents b180cac + af5d6b2 commit dc1c090
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/modules/ExternalDependenciesVersions.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(TTG_TRACKED_VG_CMAKE_KIT_TAG d1b34157c349cf0a7c2f149b7704a682d53f6486) # provides FindOrFetchLinalgPP and "real" FindOrFetchBoost
set(TTG_TRACKED_VG_CMAKE_KIT_TAG 878654d0cb1904049fbd2c37b37d5385ae897658) # provides FindOrFetchLinalgPP and "real" FindOrFetchBoost
set(TTG_TRACKED_CATCH2_VERSION 3.5.0)
set(TTG_TRACKED_MADNESS_TAG 93a9a5cec2a8fa87fba3afe8056607e6062a9058)
set(TTG_TRACKED_PARSEC_TAG 58f8f3089ecad2e8ee50e80a9586e05ce8873b1c)
Expand Down
4 changes: 3 additions & 1 deletion ttg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,10 @@ if (TARGET PaRSEC::parsec)
# parsec depends on TTG's serialization layer since it does not provide its own
if (TTG_PARSEC_USE_BOOST_SERIALIZATION AND TARGET ttg-serialization-boost)
list(APPEND ttg-parsec-deps ttg-serialization-boost)
elseif(TARGET ttg-serialization-madness)
list(APPEND ttg-parsec-deps ttg-serialization-madness)
else()
list(APPEND ttg-parsec-deps ttg-serialization)
message(WARNING "missing full-featured serialization support for ttg-parsec: either TTG_PARSEC_USE_BOOST_SERIALIZATION=OFF or Boost not found, and MADNESS not found")
endif()
add_ttg_library(ttg-parsec "${ttg-parsec-headers}"
PUBLIC_HEADER "${ttg-parsec-headers}"
Expand Down

0 comments on commit dc1c090

Please sign in to comment.