Merge branch 'hepmc3_nightly_fixes_04122020_part_10' into 'master'

Update cmake files for the HepMC3 nightlies

See merge request atlas/athena!38889

Generators/GeneratorFilters/CMakeLists.txt

@@ -15,7 +15,7 @@ atlas_add_library( GeneratorFiltersLib
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
                    PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel StoreGateLib GeneratorModulesLib xAODJet
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCsearchLib GaudiKernel StoreGateLib GeneratorModulesLib xAODJet
                    PRIVATE_LINK_LIBRARIES ${HEPPDT_LIBRARIES} AthenaKernel CxxUtils EventInfo xAODTruth TruthUtils ParticleEvent McParticleEvent )
 
 atlas_add_component( GeneratorFilters

Generators/TruthRivetTools/CMakeLists.txt

@@ -6,7 +6,6 @@
 atlas_subdir( TruthRivetTools )
 
 # External dependencies:
-find_package( HepMC )
 find_package( Rivet )
 find_package( YODA )
 find_package( FastJet )
@@ -21,9 +20,9 @@ atlas_add_library( TruthRivetToolsLib
 	Root/*.cxx TruthRivetTools/*.h
    SHARED
    PUBLIC_HEADERS TruthRivetTools
-   INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS} ${RIVET_INCLUDE_DIRS} ${YODA_INCLUDE_DIRS}
+   INCLUDE_DIRS ${RIVET_INCLUDE_DIRS} ${YODA_INCLUDE_DIRS}
    ${FASTJET_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS}
-	LINK_LIBRARIES ${HEPMC_LIBRARIES} ${RIVET_LIBRARIES} ${YODA_LIBRARIES}
+	LINK_LIBRARIES ${RIVET_LIBRARIES} ${YODA_LIBRARIES}
    ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} AsgTools AtlasHepMCLib
    GenInterfacesLib )