Merge branch 'circularDep.PixelConditionsTools-20181214' into 'master'

PixelConditionsTools: Fix circular dependency with PixelConditionsServices.

See merge request atlas/athena!16768

Former-commit-id: 171b6172

InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt

@@ -9,7 +9,9 @@ atlas_subdir( PixelConditionsTools )
 set( extra_dep )
 set( extra_lib )
 if( NOT SIMULATIONBASE )
-  set( extra_dep InnerDetector/InDetConditions/InDetConditionsSummaryService InnerDetector/InDetDetDescr/PixelGeoModel InnerDetector/InDetConditions/InDetByteStreamErrors InnerDetector/InDetConditions/PixelConditionsServices )
+  # DO NOT ADD A DEPENDENCY ON PixelConditionsServices UNLESS YOU ALSO REMOVE
+  # THE DEPENDENCY OF PixelConditionsServices ON THIS PACKAGE!!!!
+  set( extra_dep InnerDetector/InDetConditions/InDetConditionsSummaryService InnerDetector/InDetDetDescr/PixelGeoModel InnerDetector/InDetConditions/InDetByteStreamErrors )
 set( extra_lib PixelGeoModelLib InDetByteStreamErrors )
 endif()
 

InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h

@@ -11,7 +11,7 @@
 #include "InDetConditionsSummaryService/IInDetConditionsTool.h"
 
 #include "PixelConditionsTools/IPixelDCSConditionsTool.h"
-#include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
+#include "PixelConditionsTools/IPixelByteStreamErrorsSvc.h"
 
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"