From 6a18b467b92a15f8f4fb671bec2ab569eb83d892 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Mon, 16 May 2022 14:38:55 -0400 Subject: [PATCH] bump BTAS tag + make imported Boost targets IMPORTED_GLOBAL ... regimport stuff is no longer necessary --- INSTALL.md | 2 +- bin/admin/dependency-versions-update-hook.py | 2 +- cmake/modules/FindOrFetchBoost.cmake | 9 +++++++++ external/versions.cmake | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 368c663665..afe2d72dec 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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](https://github.com/ValeevGroup/BTAS), tag 1dc111d3efd6d6a4ba6f3b8cbc239315d0392121 . If usable BTAS installation is not found, TiledArray will download and compile +- [BTAS](https://github.com/ValeevGroup/BTAS), tag db884b020b5c13c312c07df9d5c03cea2d65afb2 . 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 9357dccd0cf91c0857d05ceb5f10b833fcd63308 . Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray. diff --git a/bin/admin/dependency-versions-update-hook.py b/bin/admin/dependency-versions-update-hook.py index f7aa4b8345..19b7123703 100755 --- a/bin/admin/dependency-versions-update-hook.py +++ b/bin/admin/dependency-versions-update-hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/cmake/modules/FindOrFetchBoost.cmake b/cmake/modules/FindOrFetchBoost.cmake index 4088d40c2c..13b63d3a68 100644 --- a/cmake/modules/FindOrFetchBoost.cmake +++ b/cmake/modules/FindOrFetchBoost.cmake @@ -10,6 +10,15 @@ if (NOT TARGET Boost::boost) if (TARGET Boost::boost) message(STATUS "Found Boost ${Boost_VERSION}: ${Boost_INCLUDE_DIRS}") endif(TARGET Boost::boost) + + # Boost::* targets by default are not GLOBAL, so to allow users of LINALG_LIBRARIES to safely use them we need to make them global + # more discussion here: https://gitlab.kitware.com/cmake/cmake/-/issues/17256 + foreach(tgt boost;headers) + if (TARGET Boost::${tgt}) + set_target_properties(Boost::${tgt} PROPERTIES IMPORTED_GLOBAL TRUE) + endif() + endforeach() + endif (NOT TARGET Boost::boost) # if not found, build via FetchContent diff --git a/external/versions.cmake b/external/versions.cmake index 8c79ebea23..3b7e9ec597 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -24,8 +24,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG b8069a25460b696d21cc8b739a91c9249da26575) set(TA_TRACKED_MADNESS_VERSION 0.10.1) set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1) -set(TA_TRACKED_BTAS_TAG 1dc111d3efd6d6a4ba6f3b8cbc239315d0392121) -set(TA_TRACKED_BTAS_PREVIOUS_TAG d971de75c492ad049471d9c29685aa8292c63a0f) +set(TA_TRACKED_BTAS_TAG db884b020b5c13c312c07df9d5c03cea2d65afb2) +set(TA_TRACKED_BTAS_PREVIOUS_TAG 1dc111d3efd6d6a4ba6f3b8cbc239315d0392121) set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09) set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3)