From 71fa34c3da6ebe270d81caddfa71b0ed53b30fbc Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 6 Aug 2020 17:10:07 +0200
Subject: [PATCH] NavFourMon: cmake cleanup
- remove ROOT dependency
- cleanup link dependencies and remove `atlas_depends_on_subdirs`
---
Event/NavFourMom/CMakeLists.txt | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/Event/NavFourMom/CMakeLists.txt b/Event/NavFourMom/CMakeLists.txt
index 788a9bc3cf7..932d1e88fc4 100644
--- a/Event/NavFourMom/CMakeLists.txt
+++ b/Event/NavFourMom/CMakeLists.txt
@@ -1,40 +1,23 @@
-################################################################################
-# Package: NavFourMom
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( NavFourMom )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthLinks
- Control/AthContainers
- Control/Navigation
- Event/EventKernel
- Control/CxxUtils
- PRIVATE
- Event/FourMom )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( NavFourMom
src/*.cxx
PUBLIC_HEADERS NavFourMom
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation EventKernel CxxUtils
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} FourMom )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaKernel CxxUtils EventKernel FourMom Navigation )
atlas_add_dictionary( NavFourMomDict
NavFourMom/NavFourMomDict.h
NavFourMom/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation EventKernel CxxUtils FourMom NavFourMom
+ LINK_LIBRARIES NavFourMom
NAVIGABLES DataVector<INavigable4Momentum> DataVector<IParticle>
DATA_LINKS INav4MomAssocs
ELEMENT_LINKS DataVector<I4Momentum> )
--
GitLab