bump tags for VG CMake kit and BTAS to pull in ValeevGroup/BTAS#171 a…

…nd support more robust Boost discovery (e.g. when it's been partially loaded before TA)
ValeevGroup · Jan 24, 2024 · 1bd5517 · 1bd5517
1 parent 4f8c1d3
commit 1bd5517
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 32 deletions.
diff --git 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](http://github.com/ValeevGroup/BTAS), tag 85eea7796651de1bcb4781b0081a352b32bf91d5 . If usable BTAS installation is not found, TiledArray will download and compile
+- [BTAS](http://github.com/ValeevGroup/BTAS), tag b2c18c797122b149eb088ae494dbd12f2f5ff81b . 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.

diff --git a/external/boost.cmake b/external/boost.cmake
@@ -1,32 +1,30 @@
-# Boost can be discovered by every (sub)package but only the top package can build it ...
-# if we are the top package need to include the list of Boost components to be built
-if("${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
-    set(required_components
-            headers           # TA, BTAS
-            algorithm         # TA
-            container         # TA, BTAS
-            iterator          # TA, BTAS
-            random            # TA, BTAS
-            tuple             # TA
-    )
-    if (DEFINED Boost_REQUIRED_COMPONENTS)
-        list(APPEND Boost_REQUIRED_COMPONENTS
-                    ${required_components})
-        list(REMOVE_DUPLICATES Boost_REQUIRED_COMPONENTS)
-    else()
-        set(Boost_REQUIRED_COMPONENTS "${required_components}" CACHE STRING "Components of Boost to discovered or built")
-    endif()
-    set(optional_components
-            serialization     # BTAS
+# Boost can be discovered by every (sub)package but only the top package can *build* it ...
+# in either case must declare the components used by BTAS
+set(required_components
+        headers           # TA, BTAS
+        algorithm         # TA
+        container         # TA, BTAS
+        iterator          # TA, BTAS
+        random            # TA, BTAS
+        tuple             # TA
+)
+if (DEFINED Boost_REQUIRED_COMPONENTS)
+    list(APPEND Boost_REQUIRED_COMPONENTS
+            ${required_components})
+    list(REMOVE_DUPLICATES Boost_REQUIRED_COMPONENTS)
+else()
+    set(Boost_REQUIRED_COMPONENTS "${required_components}" CACHE STRING "Components of Boost to discovered or built")
+endif()
+set(optional_components
+        serialization     # BTAS
+)
+if (DEFINED Boost_OPTIONAL_COMPONENTS)
+    list(APPEND Boost_OPTIONAL_COMPONENTS
+            ${optional_components}
     )
-    if (DEFINED Boost_OPTIONAL_COMPONENTS)
-        list(APPEND Boost_OPTIONAL_COMPONENTS
-                ${optional_components}
-        )
-        list(REMOVE_DUPLICATES Boost_OPTIONAL_COMPONENTS)
-    else()
-        set(Boost_OPTIONAL_COMPONENTS "${optional_components}" CACHE STRING "Optional components of Boost to discovered or built")
-    endif()
+    list(REMOVE_DUPLICATES Boost_OPTIONAL_COMPONENTS)
+else()
+    set(Boost_OPTIONAL_COMPONENTS "${optional_components}" CACHE STRING "Optional components of Boost to discovered or built")
 endif()
 
 if (NOT DEFINED Boost_FETCH_IF_MISSING)

diff --git a/external/versions.cmake b/external/versions.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(TA_TRACKED_VGCMAKEKIT_TAG 8713beb71ff6b7d4b1c758e9e1c7d814bd97b0af)
+set(TA_TRACKED_VGCMAKEKIT_TAG 45e7d0d8d7f994a88c5af5fc082332db7bd0d6b3)
 
 # N.B. may need to update INSTALL.md manually with the CUDA-specific version
 set(TA_TRACKED_EIGEN_VERSION 3.3.5)
@@ -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 85eea7796651de1bcb4781b0081a352b32bf91d5)
-set(TA_TRACKED_BTAS_PREVIOUS_TAG bf0c376d5cdd6f668174b2a4c67b19634d1c0da7)
+set(TA_TRACKED_BTAS_TAG b2c18c797122b149eb088ae494dbd12f2f5ff81b)
+set(TA_TRACKED_BTAS_PREVIOUS_TAG 85eea7796651de1bcb4781b0081a352b32bf91d5)
 
 set(TA_TRACKED_LIBRETT_TAG 6eed30d4dd2a5aa58840fe895dcffd80be7fbece)
 set(TA_TRACKED_LIBRETT_PREVIOUS_TAG 354e0ccee54aeb2f191c3ce2c617ebf437e49d83)