Merge branch 'xAODEventFormatCnvFix-master-20201106' into 'master'

xAODEventFormatCnv Fixes, master branch (2020.11.06.)

See merge request atlas/athena!37971

Event/xAOD/xAODEventFormatCnv/CMakeLists.txt

@@ -3,36 +3,27 @@
 # Declare the package name.
 atlas_subdir( xAODEventFormatCnv )
 
+# Find the necessary "externals".
 find_package( xAODUtilities )
 
+# Set up the "main library" of the package.
 atlas_add_component( xAODEventFormatCnv
   src/*.h src/*.cxx src/components/*.cxx
   LINK_LIBRARIES
     GaudiKernel AthenaKernel AthenaBaseComps StoreGateLib xAODEventFormat )
 
-atlas_add_component( xAODEventFormatCnvTest
-  src/test/*.h src/test/*.cxx
-  LINK_LIBRARIES
-    GaudiKernel
-    AthenaBaseComps
-    AthContainers
-    AthContainersInterfaces
-    StoreGateLib
-    xAODCore
-    xAODEventFormat )
-
+# Set up the test code of the package.
 atlas_add_library( xAODEventFormatCnvTestLib
-  src/test/*.h src/test/*.cxx
+  xAODEventFormatCnv/test/*.h xAODEventFormatCnv/test/versions/*.h
+  src/test/A_v1.cxx src/test/AAuxContainer_v1.cxx
   PUBLIC_HEADERS xAODEventFormatCnv
-  PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-  LINK_LIBRARIES
-    GaudiKernel
-    AthenaKernel
-    AthContainers
-    AthContainersInterfaces
-    xAODCore
-    xAODEventFormat
-  PRIVATE_LINK_LIBRARIES AthenaBaseComps StoreGateLib )
+  LINK_LIBRARIES AthContainers xAODCore
+  PRIVATE_LINK_LIBRARIES AthContainersInterfaces )
+
+atlas_add_component( xAODEventFormatCnvTest
+  src/test/*.h src/test/ACreatorAlg.cxx src/test/EventFormatPrinterAlg.cxx
+  LINK_LIBRARIES GaudiKernel AthenaKernel AthenaBaseComps StoreGateLib
+  xAODEventFormat xAODEventFormatCnvTestLib )
 
 atlas_add_poolcnv_library( xAODEventFormatCnvTestAthenaPoolCnv
   src/test/cnv/*.h src/test/cnv/*.cxx
@@ -46,24 +37,23 @@ atlas_add_poolcnv_library( xAODEventFormatCnvTestAthenaPoolCnv
     xAODMakerTest::AAuxContainer
   CNV_PFX xAODMakerTest
   LINK_LIBRARIES
+    GaudiKernel
+    AthenaKernel
     AthenaPoolCnvSvcLib
-    AthenaPoolUtilities
     AthContainers
     xAODEventFormatCnvTestLib )
 
+atlas_add_xaod_smart_pointer_dicts(
+  INPUT xAODEventFormatCnv/test/selection.xml
+  OUTPUT _selectionFile
+  CONTAINERS "xAODMakerTest::AVec_v1" )
+
 atlas_add_dictionary( xAODEventFormatCnvTestDict
   xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h
-  xAODEventFormatCnv/test/selection.xml
   ${_selectionFile}
-  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
   LINK_LIBRARIES xAODCore xAODEventFormatCnvTestLib
   EXTRA_FILES src/test/dict/*.cxx )
 
-atlas_add_xaod_smart_pointer_dicts(
-  INPUT xAODEventFormatCnv/test/selection.xml
-  OUTPUT _selectionFile
-  CONTAINERS "xAODMakerTest::AVec_v1" )
-
 # Install files from the package.
 atlas_install_joboptions( share/*.py )
 

Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-/* Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
 /**
  * @file xAODEventFormatCnv/test/versions/AAuxContainer_v1.h
  * @author frank berghaus <fberghaus@anl.gov>
@@ -11,8 +11,8 @@
 
 
 #include "xAODCore/AuxContainerBase.h"
+#include "xAODCore/BaseInfo.h"
 #include "AthContainers/PackedContainer.h"
-#include "AthenaKernel/BaseInfo.h"
 #include <vector>
 
 

Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/A_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-/* Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
 
 /**
  * @file xAODEventFormatCnv/test/versions/A_v1.h
@@ -11,7 +11,7 @@
 #define XAODEVENTFORMATCNV_TEST_A_V1_H
 
 #include "AthContainers/AuxElement.h"
-#include "AthenaKernel/BaseInfo.h"
+#include "xAODCore/BaseInfo.h"
 
 
 namespace xAODMakerTest {