Merge branch 'clidsvc.InDetSimData-20181020' into 'master'

InDetSimData: CLIDSvc -> AthenaKernel

See merge request atlas/athena!15202

InnerDetector/InDetRawEvent/InDetSimData/CMakeLists.txt

@@ -7,8 +7,7 @@ atlas_subdir( InDetSimData )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/Identifier
                           Generators/GeneratorObjects )
 
@@ -21,12 +20,12 @@ atlas_add_library( InDetSimData
                    src/InDetSimDataCollection.cxx
                    PUBLIC_HEADERS InDetSimData
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES SGTools Identifier GeneratorObjects
+                   LINK_LIBRARIES AthenaKernel Identifier GeneratorObjects
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( InDetSimDataDict
                       InDetSimData/InDetSimDataDict.h
                       InDetSimData/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools Identifier GeneratorObjects InDetSimData )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} Identifier GeneratorObjects InDetSimData )
 

InnerDetector/InDetRawEvent/InDetSimData/InDetSimData/InDetSimDataCollection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -14,7 +14,7 @@
 # define INDETSIMDATA_INDETSIMDATACOLLECTION_H
 
 //<<<<<< INCLUDES                                                       >>>>>>
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "InDetSimData/InDetSimData.h"
 #include "Identifier/Identifier.h"
 #include <map>