From 4eb63b3f84b4b0b33ed9288c6b6ff0ce3c48c980 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 9 Dec 2018 01:40:49 +0100
Subject: [PATCH] BLM_GeoModel: CLIDSvc -> AthenaKernel
Adjust for header moved from CLIDSvc to AthenaKernel.
Also remove unneeded dependency on SGTools.
Former-commit-id: 75f069c852041a1a0d7a15ce35acc8f314fcf944
---
.../BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.h | 4 ++--
InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.h b/InnerDetector/InDetDetDescr/BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.h
index f90f8a6cc2f..54150a66a1b 100755
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.h
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.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
*/
///////////////////////////////////////////////////////////////////
@@ -30,6 +30,6 @@ class BLM_GeometryManager
BLM_ModuleParameters m_moduli[12];
unsigned int m_on;
};
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(BLM_GeometryManager, 53024180, 1)
#endif
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
index 1c947a898ea..68d046510be 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
@@ -9,8 +9,7 @@ atlas_subdir( BLM_GeoModel )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
GaudiKernel
@@ -27,7 +26,7 @@ atlas_add_component( BLM_GeoModel
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools GeoModelKernel GaudiKernel GeoModelUtilities )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaKernel GeoModelKernel GaudiKernel GeoModelUtilities )
# Install files from the package:
atlas_install_headers( BLM_GeoModel )
--
GitLab