From a4b9c5df2750c93e5d486f98b325401386b501cb Mon Sep 17 00:00:00 2001
From: John Chapman <John.Chapman@cern.ch>
Date: Wed, 29 Jan 2025 14:25:16 +0100
Subject: [PATCH] Standardize the location of PackageName_entries.cxx
Twelve packages did not follow the convention of having the PackageName_entries.cxx
file in src/components/. This merge request updates those packages to match all
other packages in the repository.
---
.../DatabaseTest/IOVDbTestAlg/CMakeLists.txt | 4 +-
.../IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx | 9 ----
.../src/components/IOVDbTestAlg_entries.cxx | 9 ++++
Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt | 4 +-
.../{ => components}/CaloIdCnv_entries.cxx | 2 +-
.../CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt | 4 +-
.../src/CaloTTDetDescrCnv_entries.cxx | 7 ---
.../components/CaloTTDetDescrCnv_entries.cxx | 7 +++
.../IdDictDetDescrCnv/CMakeLists.txt | 4 +-
.../src/IdDictDetDescrCnv_entries.cxx | 11 -----
.../components/IdDictDetDescrCnv_entries.cxx | 11 +++++
Event/EventInfoMgt/CMakeLists.txt | 4 +-
.../EventInfoMgt/src/EventInfoMgt_entries.cxx | 7 ---
.../src/components/EventInfoMgt_entries.cxx | 7 +++
Generators/McEventSelector/CMakeLists.txt | 4 +-
.../McEventSelector_entries.cxx | 2 +-
.../InDetIdCnv/CMakeLists.txt | 4 +-
.../InDetIdCnv/src/InDetIdCnv_entries.cxx | 15 ------
.../src/components/InDetIdCnv_entries.cxx | 15 ++++++
LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt | 4 +-
.../src/{ => components}/LArIdCnv_entries.cxx | 2 +-
.../LArTest/LArConditionsTest/CMakeLists.txt | 4 +-
.../LArConditionsTest_entries.cxx | 4 +-
.../G4Atlas/G4AtlasTests/CMakeLists.txt | 4 +-
.../{ => components}/G4AtlasTests_entries.cxx | 46 +++++++++----------
TestBeam/TBDetDescrCnv/CMakeLists.txt | 4 +-
.../TBDetDescrCnv_entries.cxx | 2 +-
.../TileSvc/TileIdCnv/CMakeLists.txt | 4 +-
.../{ => components}/TileIdCnv_entries.cxx | 2 +-
29 files changed, 103 insertions(+), 103 deletions(-)
delete mode 100644 AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
create mode 100644 AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx
rename Calorimeter/CaloCnv/CaloIdCnv/src/{ => components}/CaloIdCnv_entries.cxx (96%)
delete mode 100644 Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
create mode 100644 Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx
delete mode 100644 DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
create mode 100644 DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx
delete mode 100644 Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
create mode 100644 Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx
rename Generators/McEventSelector/src/{ => components}/McEventSelector_entries.cxx (79%)
delete mode 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
create mode 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx
rename LArCalorimeter/LArCnv/LArIdCnv/src/{ => components}/LArIdCnv_entries.cxx (86%)
rename LArCalorimeter/LArTest/LArConditionsTest/src/{ => components}/LArConditionsTest_entries.cxx (76%)
rename Simulation/G4Atlas/G4AtlasTests/src/{ => components}/G4AtlasTests_entries.cxx (54%)
rename TestBeam/TBDetDescrCnv/src/{ => components}/TBDetDescrCnv_entries.cxx (59%)
rename TileCalorimeter/TileSvc/TileIdCnv/src/{ => components}/TileIdCnv_entries.cxx (61%)
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
index e73dd1aad1d..7c75723a7c3 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IOVDbTestAlg )
@@ -10,7 +10,7 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
atlas_add_component( IOVDbTestAlg
src/IOVDbTestAlg.cxx
src/IOVDbTestCoolDCS.cxx
- src/IOVDbTestAlg_entries.cxx
+ src/components/IOVDbTestAlg_entries.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} IOVDbTestConditions AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel AthenaPoolUtilities RegistrationServicesLib )
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
deleted file mode 100644
index b9ada948207..00000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "IOVDbTestAlg.h"
-#include "IOVDbTestCoolDCS.h"
-
-DECLARE_COMPONENT( IOVDbTestAlg )
-DECLARE_COMPONENT( IOVDbTestCoolDCS )
-
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx
new file mode 100644
index 00000000000..76438db3737
--- /dev/null
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx
@@ -0,0 +1,9 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../IOVDbTestAlg.h"
+#include "../IOVDbTestCoolDCS.h"
+
+DECLARE_COMPONENT( IOVDbTestAlg )
+DECLARE_COMPONENT( IOVDbTestCoolDCS )
+
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
index 2c48906cf22..3a189bab747 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdCnv )
# Component(s) in the package:
atlas_add_component( CaloIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib IdDictDetDescr Identifier GaudiKernel )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
similarity index 96%
rename from Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
rename to Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
index a5a6a6887ad..9266c1d8b82 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloIdCnv/CaloIdMgrDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
index 3de2fffe7d3..a3f866d4102 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescrCnv )
# Component(s) in the package:
atlas_add_component( CaloTTDetDescrCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib DetDescrCnvSvcLib )
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
deleted file mode 100644
index 0186997eaed..00000000000
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "CaloTTMgrDetDescrCnv.h"
-
-DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
-
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx
new file mode 100644
index 00000000000..3ddec967fe1
--- /dev/null
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx
@@ -0,0 +1,7 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../CaloTTMgrDetDescrCnv.h"
+
+DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
+
diff --git a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
index 3db9b402815..2b3f1692e44 100644
--- a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
+++ b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IdDictDetDescrCnv )
# Component(s) in the package:
atlas_add_component( IdDictDetDescrCnv
- src/*.cxx
+ src/*.cxx src/cpmponents/*.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel AtlasDetDescr DetDescrCnvSvcLib GaudiKernel GeoModelInterfaces GeoModelUtilities IdDictDetDescr IdDictParser Identifier RDBAccessSvcLib StoreGateLib )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
deleted file mode 100644
index 6a0ccc30f0b..00000000000
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "IdDictDetDescrCnv.h"
-#include "AtlasIDDetDescrCnv.h"
-#include "IdDictCnvTest.h"
-
-DECLARE_CONVERTER( AtlasIDDetDescrCnv )
-DECLARE_CONVERTER( IdDictDetDescrCnv )
-DECLARE_COMPONENT( IdDictCnvTest )
-
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx
new file mode 100644
index 00000000000..aba8545f1e4
--- /dev/null
+++ b/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx
@@ -0,0 +1,11 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../IdDictDetDescrCnv.h"
+#include "../AtlasIDDetDescrCnv.h"
+#include "../IdDictCnvTest.h"
+
+DECLARE_CONVERTER( AtlasIDDetDescrCnv )
+DECLARE_CONVERTER( IdDictDetDescrCnv )
+DECLARE_COMPONENT( IdDictCnvTest )
+
diff --git a/Event/EventInfoMgt/CMakeLists.txt b/Event/EventInfoMgt/CMakeLists.txt
index a4f514a5339..9a74bbc707e 100644
--- a/Event/EventInfoMgt/CMakeLists.txt
+++ b/Event/EventInfoMgt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( EventInfoMgt )
@@ -11,7 +11,7 @@ atlas_add_library( EventInfoMgtLib
# Component(s) in the package:
atlas_add_component( EventInfoMgt
src/TagInfoMgr.cxx
- src/EventInfoMgt_entries.cxx
+ src/components/EventInfoMgt_entries.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities EventInfo EventInfoMgtLib EventInfoUtils GaudiKernel IOVDbMetaDataToolsLib StoreGateLib )
# Install files from the package:
diff --git a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx b/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
deleted file mode 100644
index fb3fe98b025..00000000000
--- a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "TagInfoMgr.h"
-
-DECLARE_COMPONENT( TagInfoMgr )
-
diff --git a/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx b/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx
new file mode 100644
index 00000000000..c6c8feb1530
--- /dev/null
+++ b/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx
@@ -0,0 +1,7 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../TagInfoMgr.h"
+
+DECLARE_COMPONENT( TagInfoMgr )
+
diff --git a/Generators/McEventSelector/CMakeLists.txt b/Generators/McEventSelector/CMakeLists.txt
index 3d384e0a73f..abe39078028 100644
--- a/Generators/McEventSelector/CMakeLists.txt
+++ b/Generators/McEventSelector/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McEventSelector )
@@ -9,7 +9,7 @@ atlas_add_component( McEventSelector
src/McEventSelector.cxx
src/McEventCnv.cxx
src/McCnvSvc.cxx
- src/McEventSelector_entries.cxx
+ src/components/McEventSelector_entries.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GaudiKernel EventInfo )
# Install files from the package:
diff --git a/Generators/McEventSelector/src/McEventSelector_entries.cxx b/Generators/McEventSelector/src/components/McEventSelector_entries.cxx
similarity index 79%
rename from Generators/McEventSelector/src/McEventSelector_entries.cxx
rename to Generators/McEventSelector/src/components/McEventSelector_entries.cxx
index 9f92f8a0de5..8a97d69beda 100644
--- a/Generators/McEventSelector/src/McEventSelector_entries.cxx
+++ b/Generators/McEventSelector/src/components/McEventSelector_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "McEventSelector/McEventCnv.h"
#include "McEventSelector/McCnvSvc.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
index 44dc73113f9..92085a765b4 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetIdCnv )
# Component(s) in the package:
atlas_add_component( InDetIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES StoreGateLib DetDescrCnvSvcLib IdDictDetDescr GaudiKernel InDetIdentifier )
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
deleted file mode 100644
index 4250d786e59..00000000000
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-*/
-#include "PixelIDDetDescrCnv.h"
-#include "SCT_IDDetDescrCnv.h"
-#include "SiliconIDDetDescrCnv.h"
-#include "TRT_IDDetDescrCnv.h"
-#include "PLR_IDDetDescrCnv.h"
-
-DECLARE_CONVERTER(SCT_IDDetDescrCnv)
-DECLARE_CONVERTER(PixelIDDetDescrCnv)
-DECLARE_CONVERTER(SiliconIDDetDescrCnv)
-DECLARE_CONVERTER(TRT_IDDetDescrCnv)
-DECLARE_CONVERTER(PLR_IDDetDescrCnv)
-
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx
new file mode 100644
index 00000000000..fdc4a63ad0d
--- /dev/null
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx
@@ -0,0 +1,15 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../PixelIDDetDescrCnv.h"
+#include "../SCT_IDDetDescrCnv.h"
+#include "../SiliconIDDetDescrCnv.h"
+#include "../TRT_IDDetDescrCnv.h"
+#include "../PLR_IDDetDescrCnv.h"
+
+DECLARE_CONVERTER(SCT_IDDetDescrCnv)
+DECLARE_CONVERTER(PixelIDDetDescrCnv)
+DECLARE_CONVERTER(SiliconIDDetDescrCnv)
+DECLARE_CONVERTER(TRT_IDDetDescrCnv)
+DECLARE_CONVERTER(PLR_IDDetDescrCnv)
+
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt b/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
index 2f79bba0fcd..e3205b864c8 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArIdCnv )
# Component(s) in the package:
atlas_add_component( LArIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES DetDescrCnvSvcLib CaloIdentifier StoreGateLib IdDictDetDescr Identifier GaudiKernel LArIdentifier )
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
similarity index 86%
rename from LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
rename to LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
index ba7ef79cb11..bf5cecab10e 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "LArIdCnv/LArOnlineIDDetDescrCnv.h"
#include "LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index f663f4f11c9..01624e0475b 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -1,11 +1,11 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArConditionsTest )
# Component(s) in the package:
atlas_add_component( LArConditionsTest
- src/LArConditionsTest_entries.cxx
+ src/components/LArConditionsTest_entries.cxx
src/LArCondDataTest.cxx
src/LArConditionsTestAlg.cxx
src/LArCablingTest.cxx
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
similarity index 76%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
rename to LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
index f70938c4477..b553fd7c1a6 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
@@ -1,10 +1,10 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "LArConditionsTest/LArConditionsTestAlg.h"
#include "LArConditionsTest/LArCondDataTest.h"
#include "LArConditionsTest/LArCablingTest.h"
-#include "LArSCIdVsIdTest.h"
+#include "../LArSCIdVsIdTest.h"
DECLARE_COMPONENT( LArConditionsTestAlg )
DECLARE_COMPONENT( LArCondDataTest )
DECLARE_COMPONENT( LArCablingTest )
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index a80dffa64a0..366beef6f2e 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( G4AtlasTests )
@@ -10,7 +10,7 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( G4AtlasTests
- src/*.cxx
+ src/*.cxx src/components/*.cxx
OBJECT
NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
diff --git a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx b/Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
similarity index 54%
rename from Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
rename to Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
index 7e56677743a..60673aab5c4 100644
--- a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
+++ b/Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
@@ -1,29 +1,29 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "G4AtlasTests/G4TestAlg.h"
-#include "SiHitsTestTool.h"
-#include "TrtHitsTestTool.h"
-#include "LArHitsTestTool.h"
-#include "EMBHitsTestTool.h"
-#include "EMECHitsTestTool.h"
-#include "FCALHitsTestTool.h"
-#include "HECHitsTestTool.h"
-#include "TileHitsTestTool.h"
-#include "MDTHitsTestTool.h"
-#include "RPCHitsTestTool.h"
-#include "CSCHitsTestTool.h"
-#include "TGCHitsTestTool.h"
-#include "MMHitsTestTool.h"
-#include "sTGCHitsTestTool.h"
-#include "ALFA_SimHitsTestTool.h"
-#include "ZDCHitsTestTool.h"
-#include "TruthTestTool.h"
-#include "LayerTestTool.h"
-#include "CaloCalibrationHitsTestTool.h"
-#include "SteppingValidationTool.h"
-#include "LucidHitsTestTool.h"
-#include "CalibHitValidate.h"
+#include "../SiHitsTestTool.h"
+#include "../TrtHitsTestTool.h"
+#include "../LArHitsTestTool.h"
+#include "../EMBHitsTestTool.h"
+#include "../EMECHitsTestTool.h"
+#include "../FCALHitsTestTool.h"
+#include "../HECHitsTestTool.h"
+#include "../TileHitsTestTool.h"
+#include "../MDTHitsTestTool.h"
+#include "../RPCHitsTestTool.h"
+#include "../CSCHitsTestTool.h"
+#include "../TGCHitsTestTool.h"
+#include "../MMHitsTestTool.h"
+#include "../sTGCHitsTestTool.h"
+#include "../ALFA_SimHitsTestTool.h"
+#include "../ZDCHitsTestTool.h"
+#include "../TruthTestTool.h"
+#include "../LayerTestTool.h"
+#include "../CaloCalibrationHitsTestTool.h"
+#include "../SteppingValidationTool.h"
+#include "../LucidHitsTestTool.h"
+#include "../CalibHitValidate.h"
DECLARE_COMPONENT( TruthTestTool )
diff --git a/TestBeam/TBDetDescrCnv/CMakeLists.txt b/TestBeam/TBDetDescrCnv/CMakeLists.txt
index 0eaa4fedead..63b897e42d1 100644
--- a/TestBeam/TBDetDescrCnv/CMakeLists.txt
+++ b/TestBeam/TBDetDescrCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TBDetDescrCnv )
@@ -9,7 +9,7 @@ find_package( Geant4 )
# Component(s) in the package:
atlas_add_library( TBDetDescrCnv
- src/TB*.cxx
+ src/TB*.cxx src/components/*.cxx
OBJECT
NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
similarity index 59%
rename from TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
rename to TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
index a104ffd4347..699d888b042 100644
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TBDetDescrCnv/TBDetDescrCnv.h"
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt b/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
index 2f4d6addc16..348a2c6b80e 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TileIdCnv )
# Component(s) in the package:
atlas_add_component( TileIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES DetDescrCnvSvcLib StoreGateLib IdDictDetDescr GaudiKernel TileIdentifier )
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
similarity index 61%
rename from TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
rename to TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
index 3f9b871d91b..54e0e6f362b 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TileIdCnv/TileHWIDDetDescrCnv.h"
--
GitLab