Merge branch 'clidsvc.BLM_GeoModel-20181210' into 'master'

BLM_GeoModel: CLIDSvc -> AthenaKernel

See merge request atlas/athena!16623

InnerDetector/InDetDetDescr/BLM_GeoModel/BLM_GeoModel/BLM_GeometryManager.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
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -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

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 )