From 262d5693a185c89a3fd8af48ffd9c878de8437ef Mon Sep 17 00:00:00 2001 From: scott snyder Date: Tue, 5 May 2020 17:50:40 +0200 Subject: [PATCH 1/2] G4DebuggingTools: cmake fixes Don't build the same sources into more than one library. --- Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt | 4 ++-- .../G4DebuggingTools/src/{ => helper}/G4DebuggingHelper.cxx | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Simulation/G4Utilities/G4DebuggingTools/src/{ => helper}/G4DebuggingHelper.cxx (100%) diff --git a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt index 7cfd1339c88..d223876f83d 100644 --- a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt +++ b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt @@ -26,7 +26,7 @@ find_package( XercesC ) # Component(s) in the package: atlas_add_library( G4DebuggingHelperLib - src/G4DebuggingHelper.cxx + src/helper/G4DebuggingHelper.cxx PUBLIC_HEADERS G4DebuggingTools INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} LINK_LIBRARIES ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ) @@ -35,7 +35,7 @@ atlas_add_component( G4DebuggingTools src/*.cxx src/components/*.cxx INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} - LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests EventInfo G4AtlasInterfaces G4AtlasToolsLib MCTruth MCTruthBaseLib SimHelpers ) + LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} GaudiKernel AthenaBaseComps StoreGateLib SGtests EventInfo G4AtlasInterfaces G4AtlasToolsLib MCTruth MCTruthBaseLib SimHelpers G4DebuggingHelperLib ) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/G4DebuggingHelper.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/helper/G4DebuggingHelper.cxx similarity index 100% rename from Simulation/G4Utilities/G4DebuggingTools/src/G4DebuggingHelper.cxx rename to Simulation/G4Utilities/G4DebuggingTools/src/helper/G4DebuggingHelper.cxx -- GitLab From ae4f97cde2123a62375c42d6c540708ab77d4aa9 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Tue, 5 May 2020 17:51:19 +0200 Subject: [PATCH 2/2] ISF_FastCaloSimParametrization: cmake fixes Don't build the same sources into more than one library. --- .../ISF_FastCaloSimParametrization/CMakeLists.txt | 10 +++++----- .../src/{ => lib}/CaloGeometry.cxx | 0 .../src/{ => lib}/CaloGeometryFromCaloDDM.cxx | 0 .../src/{ => lib}/CaloGeometryLookup.cxx | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/{ => lib}/CaloGeometry.cxx (100%) rename Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/{ => lib}/CaloGeometryFromCaloDDM.cxx (100%) rename Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/{ => lib}/CaloGeometryLookup.cxx (100%) diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt index ff49138660c..b539faac7a7 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt @@ -66,20 +66,20 @@ atlas_add_root_dictionary( ISF_FastCaloSimParametrizationLib EXTERNAL_PACKAGES ROOT HepPDT XercesC CLHEP HepMC Geant4 ) atlas_add_library( ISF_FastCaloSimParametrizationLib - Root/*.cxx src/CaloGeometryFromCaloDDM.cxx src/CaloGeometryLookup.cxx src/CaloGeometry.cxx + Root/*.cxx src/lib/CaloGeometryFromCaloDDM.cxx src/lib/CaloGeometryLookup.cxx src/lib/CaloGeometry.cxx ${ISF_FastCaloSimParametrizationLibDictSource} PUBLIC_HEADERS ISF_FastCaloSimParametrization INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib CaloGeoHelpers AthenaBaseComps AthenaKernel Identifier GaudiKernel ISF_Interfaces TrkEventPrimitives TrkParameters TrkExInterfaces CaloDetDescrLib StoreGateLib SGtests TileConditionsLib - PRIVATE_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEANT4_LIBRARIES} CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack ) + LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} CaloGeoHelpers Identifier CaloDetDescrLib + PRIVATE_LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEANT4_LIBRARIES} ISF_FastCaloSimEvent ) atlas_add_component( ISF_FastCaloSimParametrization src/*.cxx src/components/*.cxx - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} CaloDetDescrLib CaloGeoHelpers AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel ISF_Interfaces TrkEventPrimitives TrkParameters TrkExInterfaces CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileConditionsLib TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack ISF_FastCaloSimParametrizationLib ) + INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} + LINK_LIBRARIES GaudiKernel CaloEvent CaloIdentifier AthenaPoolUtilities GeoAdaptors EventInfo NavFourMom GeneratorObjects LArSimEvent ISF_Event ISF_FastCaloSimEvent ISF_FastCaloSimInterfaces TileDetDescr TileSimEvent TrkGeometry TrkSurfaces TrkMaterialOnTrack StoreGateLib TileConditionsLib ISF_Interfaces TrkEventPrimitives TrkParameters TrkExInterfaces AthenaBaseComps AtlasHepMCLib ISF_FastCaloSimParametrizationLib ) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometry.cxx similarity index 100% rename from Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx rename to Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometry.cxx diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometryFromCaloDDM.cxx similarity index 100% rename from Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryFromCaloDDM.cxx rename to Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometryFromCaloDDM.cxx diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryLookup.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometryLookup.cxx similarity index 100% rename from Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometryLookup.cxx rename to Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/lib/CaloGeometryLookup.cxx -- GitLab