Skip to content
Snippets Groups Projects
Commit 3ab3f059 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Frank Winklmeier
Browse files

Rivet HighFive Fix, main branch (2024.03.18.)

Stopped using the HighFive imported target.

Instead switched to using the more traditional
${HIGHFIVE_INCLUDE_DIRS} variable. While the latter will require
code changes on our side in case HighFive ever becomes a
not-header-only library, this setup makes it easier to build
code on top of the ATLAS releases/nightlies.
parent 3fe8c9bf
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ find_package( FastJetContrib )
find_package( ROOT COMPONENTS Core Hist )
find_package( Rivet )
find_package( YODA )
find_package( HighFive QUIET ) # Public dependency of Rivet 4.0.0
find_package( HighFive QUIET ) # Private dependency of Rivet 4.0.0
find_package( HDF5 ) # Private dependency of Rivet 4.0.0
# Remove the --as-needed linker flags:
......@@ -24,7 +24,8 @@ atlas_add_component( Rivet_i
${RIVET_LIBRARIES} ${YODA_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel GenInterfacesLib
AthenaKernel GeneratorObjects PathResolver xAODEventInfo )
if( HIGHFIVE_FOUND )
target_link_libraries( Rivet_i PRIVATE HighFive )
target_include_directories( Rivet_i
PRIVATE ${HIGHFIVE_INCLUDE_DIRS} )
endif()
# Install file(s) from the package.
......
......@@ -26,7 +26,8 @@ atlas_add_library( TruthRivetToolsLib
${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} AsgTools AtlasHepMCLib AtlasHepMCsearchLib
CxxUtils GenInterfacesLib )
if( HIGHFIVE_FOUND )
target_link_libraries( TruthRivetToolsLib PUBLIC HighFive )
target_include_directories( TruthRivetToolsLib
PUBLIC ${HIGHFIVE_INCLUDE_DIRS} )
endif()
atlas_add_component( TruthRivetTools
......
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