From 9ea1da090d48577326087b520e8b5f556e625816 Mon Sep 17 00:00:00 2001 From: Zach Marshall <ZLMarshall@lbl.gov> Date: Tue, 19 Mar 2019 21:33:08 +0100 Subject: [PATCH] Updating CMake file to avoid G4 dep in generator builds --- .../G4Extensions/RHadrons/CMakeLists.txt | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Simulation/G4Extensions/RHadrons/CMakeLists.txt b/Simulation/G4Extensions/RHadrons/CMakeLists.txt index 268f113ce3d3..78a09cadd556 100644 --- a/Simulation/G4Extensions/RHadrons/CMakeLists.txt +++ b/Simulation/G4Extensions/RHadrons/CMakeLists.txt @@ -5,29 +5,31 @@ # Declare the package name: atlas_subdir( RHadrons ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - GaudiKernel - PRIVATE - Control/AthenaBaseComps - Control/CxxUtils - Simulation/G4Atlas/G4AtlasInterfaces - Simulation/G4Atlas/G4AtlasTools - Simulation/G4Extensions/G4ExternalDecay - Simulation/G4Sim/SimHelpers ) +if( NOT GENERATIONBASE ) + # Declare the package's dependencies: + atlas_depends_on_subdirs( PUBLIC + GaudiKernel + PRIVATE + Control/AthenaBaseComps + Control/CxxUtils + Simulation/G4Atlas/G4AtlasInterfaces + Simulation/G4Atlas/G4AtlasTools + Simulation/G4Extensions/G4ExternalDecay + Simulation/G4Sim/SimHelpers ) -# External dependencies: -find_package( CLHEP ) -find_package( Geant4 ) -find_package( XercesC ) -find_package( Pythia8 ) + # External dependencies: + find_package( CLHEP ) + find_package( Geant4 ) + find_package( XercesC ) + find_package( Pythia8 ) -# Component(s) in the package: -atlas_add_component( RHadrons - src/*.cxx - src/components/*.cxx - INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} - LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${PYTHIA8_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces G4AtlasToolsLib G4ExternalDecay SimHelpers Pythia8_iLib ) + # Component(s) in the package: + atlas_add_component( RHadrons + src/*.cxx + src/components/*.cxx + INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} + LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${PYTHIA8_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces G4AtlasToolsLib G4ExternalDecay SimHelpers Pythia8_iLib ) +endif() # Install files from the package: atlas_install_python_modules( python/*.py ) -- GitLab