Skip to content
Snippets Groups Projects
Commit 7576d500 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

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

StoreGateTests: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14580
parents e2cbd51d 224d8d0f
No related branches found
No related tags found
No related merge requests found
...@@ -8,10 +8,9 @@ atlas_subdir( StoreGateTests ) ...@@ -8,10 +8,9 @@ atlas_subdir( StoreGateTests )
# Declare the package's dependencies: # Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC atlas_depends_on_subdirs( PUBLIC
Control/AthenaPython Control/AthenaPython
Control/CLIDSvc Control/AthenaKernel
Control/AthAllocators Control/AthAllocators
Control/AthContainers Control/AthContainers
Control/SGTools
PRIVATE PRIVATE
Control/AthenaBaseComps Control/AthenaBaseComps
Control/StoreGate Control/StoreGate
...@@ -25,13 +24,13 @@ atlas_add_component( StoreGateTests ...@@ -25,13 +24,13 @@ atlas_add_component( StoreGateTests
src/*.cxx src/*.cxx
src/components/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers SGTools AthenaBaseComps StoreGateLib SGtests GaudiKernel ) LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel )
atlas_add_dictionary( StoreGateTestsDict atlas_add_dictionary( StoreGateTestsDict
StoreGateTests/StoreGateTestsDict.h StoreGateTests/StoreGateTestsDict.h
StoreGateTests/selection.xml StoreGateTests/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers SGTools AthenaBaseComps StoreGateLib SGtests GaudiKernel ) LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel )
# Install files from the package: # Install files from the package:
atlas_install_headers( StoreGateTests ) atlas_install_headers( StoreGateTests )
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include "AthContainers/DataVector.h" #include "AthContainers/DataVector.h"
#include "CLIDSvc/CLASS_DEF.h" #include "AthenaKernel/CLASS_DEF.h"
namespace SgTests { namespace SgTests {
struct PayLoad { struct PayLoad {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment