From acbe2846e2615a308b88aeaf1a6b5bd2e664e47c Mon Sep 17 00:00:00 2001 From: Christos Anastopoulos <christos.anastopoulos@cern.ch> Date: Wed, 13 May 2020 10:07:07 +0000 Subject: [PATCH] MagFieldElements : Including EventPrimitives helps clients to avoid Eigen_plugin issues --- MagneticField/MagFieldElements/CMakeLists.txt | 6 +++--- .../MagFieldElements/MagFieldElements/BFieldCond.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MagneticField/MagFieldElements/CMakeLists.txt b/MagneticField/MagFieldElements/CMakeLists.txt index c04fc6894da..30aa8f0454f 100644 --- a/MagneticField/MagFieldElements/CMakeLists.txt +++ b/MagneticField/MagFieldElements/CMakeLists.txt @@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC MagneticField/MagFieldInterfaces MagneticField/MagFieldConditions Control/CxxUtils + Event/EventPrimitives PRIVATE MagneticField/MagFieldElements Control/StoreGate @@ -20,15 +21,14 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) -find_package( Eigen ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) # Component(s) in the package: atlas_add_library( MagFieldElements src/*.cxx PUBLIC_HEADERS MagFieldElements - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel CxxUtils) + INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} + LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel CxxUtils EventPrimitives) # Install files from the package: atlas_install_headers( MagFieldElements ) diff --git a/MagneticField/MagFieldElements/MagFieldElements/BFieldCond.h b/MagneticField/MagFieldElements/MagFieldElements/BFieldCond.h index 122300b0b1f..27d857f010e 100644 --- a/MagneticField/MagFieldElements/MagFieldElements/BFieldCond.h +++ b/MagneticField/MagFieldElements/MagFieldElements/BFieldCond.h @@ -14,7 +14,7 @@ #ifndef BFIELDCOND_H #define BFIELDCOND_H -#include <Eigen/Dense> +#include "EventPrimitives/EventPrimitives.h" #include <cmath> class BFieldCond -- GitLab