From 52c55a2d3c3be49f099b8ee7157ff4fef9c8a059 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 17 Nov 2018 15:51:26 +0100
Subject: [PATCH] TrkEventUtils: CLIDSvc -> AthenaKernel.
Adjust for headers moved from CLIDSvc to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
Tracking/TrkEvent/TrkEventUtils/CMakeLists.txt | 5 ++---
.../TrkEventUtils/TrkEventUtils/TrackMatchingMultiMap.h | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Tracking/TrkEvent/TrkEventUtils/CMakeLists.txt b/Tracking/TrkEvent/TrkEventUtils/CMakeLists.txt
index b63cfbcd062..be8a9f52e2f 100644
--- a/Tracking/TrkEvent/TrkEventUtils/CMakeLists.txt
+++ b/Tracking/TrkEvent/TrkEventUtils/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( TrkEventUtils )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
DetectorDescription/GeoPrimitives
Event/EventPrimitives
Tracking/TrkDetDescr/TrkSurfaces
@@ -34,6 +33,6 @@ atlas_add_library( TrkEventUtils
src/*.cxx
PUBLIC_HEADERS TrkEventUtils
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} SGTools GeoPrimitives EventPrimitives TrkSurfaces TrkEventPrimitives TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrack
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives TrkSurfaces TrkEventPrimitives TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrack
PRIVATE_LINK_LIBRARIES AtlasDetDescr TrkCompetingRIOsOnTrack TrkPseudoMeasurementOnTrack TrkSegment TrkSpacePoint TrkVertexOnTrack )
diff --git a/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/TrackMatchingMultiMap.h b/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/TrackMatchingMultiMap.h
index ca1013f90ff..24714c13add 100644
--- a/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/TrackMatchingMultiMap.h
+++ b/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/TrackMatchingMultiMap.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRKEVENTUTILS_TRACKMATCHINGMULTIMAP_H
@@ -7,7 +7,7 @@
#include <map>
#include "TrkTrack/Track.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
/**This typedef represents a multimap that holds the matching chi2 of two tracks
from different track collections together with a boolean that indicatges if the
--
GitLab