From 409d86976e1f68aa979e6f6742d31145d655f369 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 26 Sep 2018 16:43:40 +0200
Subject: [PATCH] AthenaDBTestRec: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../AthenaDBTestRec/TestCoolRecPoolData.h | 2 +-
.../AthenaDBTestRec/TestCoolRecPoolDataColl.h | 2 +-
.../DatabaseTest/AthenaDBTestRec/CMakeLists.txt | 12 +++++-------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h
index 385f616473b..a40d9d02a02 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h
@@ -10,7 +10,7 @@
#include<vector>
#include<string>
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
class TestCoolRecPoolData {
public:
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h
index 9dbbfb1fe14..96ebf519afe 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h
@@ -9,7 +9,7 @@
// Richard Hawkings, started 16/8/06
#include "AthenaPoolUtilities/CondMultChanCollection.h"
#include "AthenaDBTestRec/TestCoolRecPoolData.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
typedef CondMultChanCollection<TestCoolRecPoolData> TestCoolRecPoolDataColl;
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt
index fa78dfc02d3..85cc80bc408 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt
@@ -9,8 +9,6 @@ atlas_subdir( AthenaDBTestRec )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
- Control/CLIDSvc
- Control/SGTools
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
GaudiKernel
@@ -38,31 +36,31 @@ atlas_add_library( AthenaDBTestRecLib
src/lib/*.cxx
PUBLIC_HEADERS AthenaDBTestRec
PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib
PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CollectionBase CollectionUtilities PersistencySvc StorageSvc CoraCool PersistentDataModel EventInfo )
atlas_add_component( AthenaDBTestRec
src/components/*.cxx
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
atlas_add_poolcnv_library( AthenaDBTestRecPoolCnv
src/*.cxx
FILES AthenaDBTestRec/TestCoolRecPoolData.h AthenaDBTestRec/TestCoolRecPoolDataColl.h
MULT_CHAN_TYPES TestCoolRecPoolDataColl
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
atlas_add_dictionary( AthenaDBTestRecDataDict
AthenaDBTestRec/AthenaDBTestRecDataDict.h
AthenaDBTestRec/selection.xml
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
atlas_add_executable( TestCoolRecWriter
src/app/*.cxx
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
--
GitLab