From 92ed4e043877e1796876f798329735cf8fb8d535 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 6 May 2020 16:51:18 +0200 Subject: [PATCH 1/2] AFP_G4_SD: cmake fix Don't build the same source into more than one library. --- ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt b/ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt index eb72fd244670..cffc1e14707c 100644 --- a/ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt +++ b/ForwardDetectors/AFP/AFP_G4_SD/CMakeLists.txt @@ -23,12 +23,6 @@ find_package( XercesC ) find_package( GTest ) # Component(s) in the package: -atlas_add_component( AFP_G4_SD - src/*.cxx - src/components/*.cxx - INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel StoreGateLib SGtests AFP_Geometry AFP_SimEv G4AtlasToolsLib ) - atlas_add_library( AFP_G4_SDLib src/*.cxx NO_PUBLIC_HEADERS AFP_G4_SD @@ -36,6 +30,10 @@ atlas_add_library( AFP_G4_SDLib LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CxxUtils StoreGateLib SGtests AFP_Geometry AFP_SimEv G4AtlasToolsLib ) +atlas_add_component( AFP_G4_SD + src/components/*.cxx + LINK_LIBRARIES AFP_G4_SDLib ) + atlas_add_test( AFP_SensitiveDetector_gtest SOURCES test/AFP_SensitiveDetector_gtest.cxx -- GitLab From 77347046c6ee19184282ea8ed7eb479f32434021 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Wed, 6 May 2020 16:51:34 +0200 Subject: [PATCH 2/2] TrigEgammaAnalysisTools: cmake fixe Don't build the same sources into more than one library. --- Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt index 7a5ff4dd491e..03461a2f7523 100644 --- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt +++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt @@ -51,7 +51,7 @@ atlas_add_library( TrigEgammaAnalysisToolsLib LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODCaloEvent xAODEgamma xAODEventInfo xAODJet xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODMissingET xAODTrigger xAODCaloRings xAODTruth LumiBlockCompsLib EgammaAnalysisInterfacesLib - RecoToolInterfaces egammaMVACalibAnalysisLib TrigDecisionToolLib + RecoToolInterfaces egammaMVACalibAnalysisLib TrigEgammaMatchingToolLib TrigEgammaEmulationToolLib TrigConfHLTData TrigSteeringEvent TrigHLTMonitoringLib PATCoreLib PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfxAODLib ) @@ -59,10 +59,9 @@ atlas_add_library( TrigEgammaAnalysisToolsLib atlas_add_component( TrigEgammaAnalysisTools src/*.h src/*.cxx - Root/*.cxx src/components/*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AsgTools xAODCaloEvent xAODMissingET xAODEgamma xAODEventInfo xAODJet xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODCaloRings xAODTrigger xAODTruth LumiBlockCompsLib ElectronPhotonSelectorToolsLib egammaMVACalibLib TrigDecisionToolLib TrigEgammaMatchingToolLib TrigEgammaEmulationToolLib TrigConfHLTData TrigSteeringEvent TrigHLTMonitoringLib AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests GaudiKernel PATCoreLib ) + LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ElectronPhotonSelectorToolsLib egammaMVACalibLib TrigDecisionToolLib AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests GaudiKernel TrigEgammaAnalysisToolsLib ) # Install files from the package: atlas_install_python_modules( python/TrigEgamma*.py ) -- GitLab