Merge branch 'clidsvc.IOVDbDataModel-20180928' into 'master'

IOVDbDataModel: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14583

Database/IOVDbDataModel/CMakeLists.txt

@@ -8,8 +8,6 @@ atlas_subdir( IOVDbDataModel )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           Database/AthenaPOOL/AthenaPoolUtilities
                           GaudiKernel
                           PRIVATE
@@ -23,12 +21,12 @@ atlas_add_library( IOVDbDataModel
                    src/*.cxx
                    PUBLIC_HEADERS IOVDbDataModel
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaKernel SGTools AthenaPoolUtilities GaudiKernel RootUtilsPyROOT
+                   LINK_LIBRARIES AthenaKernel AthenaPoolUtilities GaudiKernel RootUtilsPyROOT
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} RootUtils )
 
 atlas_add_dictionary( IOVDbDataModelDict
                       IOVDbDataModel/IOVDbDataModelDict.h
                       IOVDbDataModel/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel SGTools AthenaPoolUtilities GaudiKernel RootUtils RootUtilsPyROOT IOVDbDataModel )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaPoolUtilities GaudiKernel RootUtils RootUtilsPyROOT IOVDbDataModel )
 

Database/IOVDbDataModel/IOVDbDataModel/IOVMetaDataContainer.h

@@ -158,9 +158,7 @@ IOVMetaDataContainer::setFolderDescription(const std::string& description)
     m_folderDescription = description;
 }
 
-#ifndef CLIDSVC_CLASSDEF_H
-# include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( IOVMetaDataContainer , 1316383046 , 1 )