Update ACTS to version 46.5.0 and use its detray

This commit updates our ACTS dependency to version 46.5.0. It also
removes our own external detray mechanisms and relies almost entirely on
ACTS to provide detray. Until ACTS directly exposes the detray targets,
we still need to FetchContent the detray content from the ACTS
repository. Also automatically adds the ITk detector metadata if it is
not provided.

Author: stephenswat

.github/workflows/builds.yml

@@ -114,11 +114,11 @@ jobs:
       - name: Build ACTS
         run: |
           export CMAKE_PREFIX_PATH=/json_install/:${CMAKE_PREFIX_PATH}
-          wget https://github.com/acts-project/acts/archive/refs/tags/v46.0.0.tar.gz
-          tar -xvf v46.0.0.tar.gz
+          wget https://github.com/acts-project/acts/archive/refs/tags/v46.5.0.tar.gz
+          tar -xvf v46.5.0.tar.gz
           export CXX=g++
           cmake \
-            -S acts-46.0.0 \
+            -S acts-46.5.0 \
             -B /acts_build/ \
             -DACTS_BUILD_PLUGIN_JSON=ON \
             -DACTS_USE_SYSTEM_NLOHMANN_JSON=ON \
@@ -137,6 +137,7 @@ jobs:
             -DDETRAY_USE_SYSTEM_NLOHMANN=ON \
             -DTRACCC_SUPPORTED_DETECTORS="default_detector;odd_detector;telescope_detector;toy_detector;itk_detector" \
             -DDETRAY_GENERATE_METADATA="itk_metadata" \
+            -FETCHCONTENT_SOURCE_DIR_DETRAY="acts-46.5.0/Detray" \
             -S ${GITHUB_WORKSPACE} \
             -B build
       - name: Build

CMakeLists.txt

@@ -298,20 +298,6 @@ if( TRACCC_SETUP_COVFIE )
    endif()
 endif()
 
-# Set up Detray.
-option( TRACCC_SETUP_DETRAY
-   "Set up the Detray target(s) explicitly" TRUE )
-option( TRACCC_USE_SYSTEM_DETRAY
-   "Pick up an existing installation of Detray from the build environment"
-   ${TRACCC_USE_SYSTEM_LIBS} )
-if( TRACCC_SETUP_DETRAY )
-   if( TRACCC_USE_SYSTEM_DETRAY )
-      find_package( detray REQUIRED )
-   else()
-      add_subdirectory( extern/detray )
-   endif()
-endif()
-
 # Set up Acts.
 option( TRACCC_SETUP_ACTS
    "Set up the Acts target(s) explicitly" TRUE )

README.md

@@ -242,7 +242,6 @@ cmake --build build/
 | TRACCC_BUILD_TESTING  | Build the (unit) tests of traccc |
 | TRACCC_BUILD_EXAMPLES  | Build the examples of traccc |
 | TRACCC_USE_SYSTEM_VECMEM | Pick up an existing installation of VecMem from the build environment |
-| TRACCC_USE_SYSTEM_DETRAY | Pick up an existing installation of Detray from the build environment |
 | TRACCC_USE_SYSTEM_ACTS | Pick up an existing installation of Acts from the build environment |
 | TRACCC_USE_SYSTEM_GOOGLETEST | Pick up an existing installation of GoogleTest from the build environment |
 | TRACCC_USE_ROOT | Build physics performance analysis code using an existing installation of ROOT from the build environment |

extern/acts/CMakeLists.txt

@@ -9,11 +9,11 @@ cmake_minimum_required( VERSION 3.25 )
 include( FetchContent )
 
 # Tell the user what's happening.
-message( STATUS "Building Acts as part of the TRACCC project" )
+message( STATUS "Building Acts (including Detray) as part of the TRACCC project" )
 
 # Declare where to get Acts from.
 set( TRACCC_ACTS_SOURCE
-   "URL;https://github.com/acts-project/acts/archive/refs/tags/v46.0.0.tar.gz;URL_MD5;1e0cc5c3db1b5605c792b66a366de6d1"
+   "URL;https://github.com/acts-project/acts/archive/refs/tags/v46.5.0.tar.gz;URL_MD5;3c9901b3e624f19aeb90ee251d93e717"
    CACHE STRING "Source for Acts, when built as part of this project" )
 mark_as_advanced( TRACCC_ACTS_SOURCE )
 FetchContent_Declare( Acts SYSTEM ${TRACCC_ACTS_SOURCE} )
@@ -28,3 +28,21 @@ set( ACTS_BUILD_PLUGIN_JSON TRUE CACHE BOOL
 
 # Get it into the current directory.
 FetchContent_MakeAvailable( Acts )
+
+# The ITk metadata is required, so explicitly request that it be built.
+if (NOT("itk_metadata" IN_LIST DETRAY_GENERATE_METADATA))
+   list(APPEND DETRAY_GENERATE_METADATA "itk_metadata")
+endif()
+
+# HACK: This is not the most elegant solution. Ideally, ACTS would have a flag
+# to export the targets contained within the Detray/ directory, but currently
+# it does not. Thus, we use the downloaded copy of ACTS and find the Detray/
+# directory inside of it. Temporary solution.
+set(DETRAY_BUILD_TEST_UTILS TRUE CACHE BOOL "")
+FetchContent_Declare( Detray )
+set(FETCHCONTENT_SOURCE_DIR_DETRAY
+    "${acts_SOURCE_DIR}/Detray/"
+    CACHE STRING
+    ""
+)
+FetchContent_MakeAvailable(Detray SYSTEM)