From 53c56185502bb7444f8eecf24d729fcffed34e09 Mon Sep 17 00:00:00 2001 From: Frederik Date: Thu, 18 Jul 2024 16:18:08 +0200 Subject: [PATCH] add defs DETRAY_ALGEBRA_ARRAY and moved algebra plugin add defs --- CMakeLists.txt | 2 -- thirdparty/algebra-plugins/CMakeLists.txt | 2 ++ thirdparty/detray/CMakeLists.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 418656a82b96..28b27d7b47b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,8 +301,6 @@ endmacro() # the same package twice. This avoids having complex if/else trees to sort out # when a particular package is actually needed. -add_definitions(-DALGEBRA_PLUGINS_INCLUDE_ARRAY) - # plugin dependencies if(ACTS_BUILD_PLUGIN_ACTSVG) diff --git a/thirdparty/algebra-plugins/CMakeLists.txt b/thirdparty/algebra-plugins/CMakeLists.txt index 75fb0f9ad77b..f7508fb069f4 100644 --- a/thirdparty/algebra-plugins/CMakeLists.txt +++ b/thirdparty/algebra-plugins/CMakeLists.txt @@ -14,6 +14,8 @@ message( STATUS "Building algebra-plugins as part of the Acts project" ) FetchContent_Declare( AlgebraPlugins ${ACTS_ALGEBRAPLUGINS_SOURCE} ) +add_definitions(-DALGEBRA_PLUGINS_INCLUDE_ARRAY) + # Options used in the build of Algebra Plugins. set(ALGEBRA_PLUGINS_BUILD_TESTING FALSE CACHE BOOL "Turn off the build of the Algebra Plugins unit tests") diff --git a/thirdparty/detray/CMakeLists.txt b/thirdparty/detray/CMakeLists.txt index 7274dcb68749..1188da9fca14 100644 --- a/thirdparty/detray/CMakeLists.txt +++ b/thirdparty/detray/CMakeLists.txt @@ -17,6 +17,8 @@ set( DETRAY_VERSION "v${_acts_detray_version}") # Declare where to get Detray from. FetchContent_Declare( Detray ${ACTS_DETRAY_SOURCE} ) +add_definitions( DETRAY_ALGEBRA_ARRAY ) + # Options used in the build of Detray. set( DETRAY_CUSTOM_SCALARTYPE "float" CACHE STRING "Scalar type to use in the Detray code" )