From c025e73986434fd8781c37b9ae9752fc83cfdbd1 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Tue, 19 Nov 2024 17:22:16 -0500 Subject: [PATCH 1/2] [cmake] if TTG_PARSEC_USE_BOOST_SERIALIZATION=ON but boost found make ttg-parsec only use madness serialization --- ttg/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ttg/CMakeLists.txt b/ttg/CMakeLists.txt index 644b4dfb4..f2ab0fde8 100644 --- a/ttg/CMakeLists.txt +++ b/ttg/CMakeLists.txt @@ -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}" From af5d6b25703617f8a8f33b8b27f1851fc5a98022 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Wed, 20 Nov 2024 08:05:44 -0500 Subject: [PATCH 2/2] [cmake] bump VG CMake kit to install Boost::iostreams target correctly if built from source --- cmake/modules/ExternalDependenciesVersions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/ExternalDependenciesVersions.cmake b/cmake/modules/ExternalDependenciesVersions.cmake index 49f66fe0a..dd7347c25 100644 --- a/cmake/modules/ExternalDependenciesVersions.cmake +++ b/cmake/modules/ExternalDependenciesVersions.cmake @@ -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)