Skip to content
Snippets Groups Projects

[Futurev4] fix failing tests

Merged Michal Mazurek requested to merge Futurev3_fix_failing_tests into Futurev4
All threads resolved!
1 file
+ 7
6
Compare changes
  • Side-by-side
  • Inline
@@ -38,9 +38,9 @@ string(REPLACE "/include" "" TAUOLA++_ROOT_DIR ${TAUOLA++_INCLUDE_DIR})
# Specify the required library components for the external generators
# In particular, in Photos++ v3.56 the components differ from those in v3.61
# (which is the version assumed by default in the HepForge EvtGen cmake modules)
set(Pythia8_FIND_COMPONENTS pythia8 CACHE STRING "Required components of Pythia8")
set(PHOTOS++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING "Required components of Photos++")
set(Tauola++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING "Required components of Tauola++")
set(EVTGEN_PYTHIA8_FIND_COMPONENTS pythia8 CACHE STRING "Required components of Pythia8")
set(EVTGEN_PHOTOS++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING "Required components of Photos++")
set(EVTGEN_TAUOLA++_FIND_COMPONENTS CxxInterface Fortran CACHE STRING "Required components of Tauola++")
# Pass on the Gaudi C++ Standard to the EvtGen build
string(REPLACE "c++" "" EVTGEN_CXX_STANDARD ${GAUDI_CXX_STANDARD})
@@ -51,17 +51,18 @@ ExternalProject_Add(EvtGenHepForge
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DHEPMC2_ROOT_DIR=${HEPMC2_ROOT_DIR}
-DPYTHIA8_ROOT_DIR=${PYTHIA8_ROOT_DIR}
-DPythia8_FIND_COMPONENTS=${Pythia8_FIND_COMPONENTS}
-DPythia8_FIND_COMPONENTS=${EVTGEN_PYTHIA8_FIND_COMPONENTS}
-DPHOTOS++_ROOT_DIR=${PHOTOS++_ROOT_DIR}
-DPHOTOS++_FIND_COMPONENTS=${PHOTOS++_FIND_COMPONENTS}
-DPHOTOS++_FIND_COMPONENTS=${EVTGEN_PHOTOS++_FIND_COMPONENTS}
-DTAUOLA++_ROOT_DIR=${TAUOLA++_ROOT_DIR}
-DTauola++_FIND_COMPONENTS=${Tauola++_FIND_COMPONENTS}
-DTauola++_FIND_COMPONENTS=${EVTGEN_TAUOLA++_FIND_COMPONENTS}
-DEVTGEN_PYTHIA=ON
-DEVTGEN_PHOTOS=ON
-DEVTGEN_TAUOLA=ON
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_STANDARD=${EVTGEN_CXX_STANDARD}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
CMAKE_COMMAND ${env_cmd} ${CMAKE_COMMAND}
)
Loading