Merge branch 'clidsvc.AFP_Geometry-20181003' into 'master'

AFP_Geometry: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14705

Former-commit-id: 4374b06e

ForwardDetectors/AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h

@@ -11,10 +11,7 @@
 
 #include "CLHEP/Geometry/Point3D.h"
 #include "GeoModelKernel/GeoTransform.h"
-#include "CLIDSvc/CLASS_DEF.h"
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <list>
 #include <map>

ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt

@@ -7,11 +7,9 @@ atlas_subdir( AFP_Geometry )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/GeoModel/GeoModelKernel
                           PRIVATE
-                          Control/AthenaKernel
                           Control/StoreGate
                           GaudiKernel
                           Tools/PathResolver )
@@ -25,6 +23,6 @@ atlas_add_library( AFP_Geometry
                    PUBLIC_HEADERS AFP_Geometry
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} SGTools GeoModelKernel StoreGateLib SGtests
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} GeoModelKernel StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel PathResolver )