Skip to content
Snippets Groups Projects
Commit b1218aab authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'mastermctester' into 'master'

Update MCTester cmake config.

See merge request !49625
parents b11ba38d 35eec03d
No related branches found
No related tags found
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!49625Update MCTester cmake config.
...@@ -6,19 +6,8 @@ atlas_subdir( MCTester_i ) ...@@ -6,19 +6,8 @@ atlas_subdir( MCTester_i )
# External dependencies: # External dependencies:
find_package( MCTester ) find_package( MCTester )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
if (HEPMC3_USE) set( MCTester_sources src/MCTesterAlg.cxx)
set( MCTester_sources src/MCTesterAlg.cxx set( HEPMC_MCTester_INTERFACE_DIR ${MCTESTER_INCLUDE_DIRS})
${HEPMC3_INCLUDE_DIR}/../share/HepMC3/interfaces/mc-tester/src/HepMC3Particle.cxx
${HEPMC3_INCLUDE_DIR}/../share/HepMC3/interfaces/mc-tester/src/HepMC3Event.cxx)
set( HEPMC_MCTester_INTERFACE_DIR ${HEPMC3_INCLUDE_DIR}/../share/HepMC3/interfaces/mc-tester/include)
#This is needed for HepMC3 only as the HepMC2 interface compiled in MC-TESTER (with the same warnings)
#Should be removed after next MC-TESTER release
set_source_files_properties("${HEPMC3_INCLUDE_DIR}/../share/HepMC3/interfaces/mc-tester/src/HepMC3Event.cxx" PROPERTIES COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-unused-parameter")
set_source_files_properties("${HEPMC3_INCLUDE_DIR}/../share/HepMC3/interfaces/mc-tester/src/HepMC3Particle.cxx" PROPERTIES COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-unused-parameter")
else()
set( MCTester_sources src/MCTesterAlg.cxx)
set( HEPMC_MCTester_INTERFACE_DIR ${MCTESTER_INCLUDE_DIRS})
endif()
# Component(s) in the package: # Component(s) in the package:
atlas_add_component( MCTester_i atlas_add_component( MCTester_i
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment