Merge branch 'clidsvc.ALFA_SimEv-20181004' into 'master'

ALFA_SimEv: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14734

Former-commit-id: b206f124

ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h

@@ -8,10 +8,7 @@
 
 #include "ALFA_SimEv/ALFA_Hit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<ALFA_Hit> ALFA_HitCollection;
 typedef AtlasHitsVector<ALFA_Hit>::iterator ALFA_HitIter;

ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h

@@ -8,10 +8,7 @@
 
 #include "ALFA_SimEv/ALFA_ODHit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 typedef AtlasHitsVector<ALFA_ODHit> ALFA_ODHitCollection;
 typedef AtlasHitsVector<ALFA_ODHit>::iterator ALFA_ODHitIter;

ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt

@@ -7,8 +7,7 @@ atlas_subdir( ALFA_SimEv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Simulation/HitManagement
                           PRIVATE
                           GaudiKernel )
@@ -21,12 +20,12 @@ atlas_add_library( ALFA_SimEv
                    src/*.cxx
                    PUBLIC_HEADERS ALFA_SimEv
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES SGTools HitManagement
+                   LINK_LIBRARIES AthenaKernel HitManagement
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
 
 atlas_add_dictionary( ALFA_SimEvDict
                       ALFA_SimEv/ALFA_SimEvDict.h
                       ALFA_SimEv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement GaudiKernel ALFA_SimEv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} HitManagement GaudiKernel ALFA_SimEv )