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

Merge branch 'rootmap.GeneratorObjects-20200414' into 'master'

GeneratorObjects: Suppress duplicate dictionary warnings from hepmc3.

See merge request !31982
parents e85f469e ea96745f
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!31982GeneratorObjects: Suppress duplicate dictionary warnings from hepmc3.
......@@ -43,6 +43,14 @@ atlas_add_dictionary( GeneratorObjectsDict
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthContainers AthLinks SGTools xAODTruth GaudiKernel TestTools AthenaKernel RootUtils RootUtilsPyROOT StoreGateLib SGtests GeneratorObjects )
# Install a dummy rootmap file to suppress loading the rootmap from hepmc3,
# which defines dictionary entries for HepMC types that clash with
# what we generate here (and result in ROOT giving duplicate rootmap
# entry warnings). See !31633.
atlas_install_generic ( share/libHepMC3rootIO.rootmap
DESTINATION ${CMAKE_INSTALL_LIBDIR}
BUILD_DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} )
atlas_add_test( HepMcParticleLink_test
SOURCES test/HepMcParticleLink_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
......
# Dummy rootmap file installed by GeneratorObjects to suppress loading
# the rootmap file from hepmc3 due to clashing dictionary entries
# for HepMC types.
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