Commit 6921c998 authored by Gerardo Ganis's avatar Gerardo Ganis
Browse files

Merge branch 'gaudi-v36r2' into 'master'

Upgrade Gaudi version for dev4 to latest tag v36r2

See merge request !982
parents 3039449a f2180ace
Pipeline #3165381 passed with stage
in 57 seconds
......@@ -10,7 +10,7 @@ LCG_AA_project(Geant4 10.07.p02)
LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git)
if(${LCG_OS}${LCG_OSVERS} MATCHES centos7|ubuntu18|ubuntu20)
if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 7)) OR (${LCG_COMP} MATCHES clang))
LCG_AA_project(Gaudi v35r1 GIT=https://gitlab.cern.ch/gaudi/Gaudi.git)
LCG_AA_project(Gaudi v36r2 GIT=https://gitlab.cern.ch/gaudi/Gaudi.git)
endif()
endif()
LCG_AA_project(DD4hep 01.18 )
......
......@@ -79,7 +79,7 @@ if(ROOT_native_version)
ENVIRONMENT MYSQL_HOME=${mysql_home}
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
IF ROOT_version VERSION_EQUAL 99 THEN
IF ROOT_version VERSION_EQUAL 99 OR ROOT_version VERSION_GREATER_EQUAL 6.20 THEN
-Droot7=ON
ELSE
-Droot7=OFF
......@@ -220,7 +220,7 @@ if(ROOT_native_version)
IF ROOT_version VERSION_GREATER 6.22 AND DEFINED jsonmcpp_native_version THEN
jsonmcpp
ENDIF
REVISION 1
)
endif()
......@@ -240,6 +240,7 @@ if(ROOT_native_version)
add_dependencies(ROOT-dependencies ${dep})
endif()
endforeach()
endif(ROOT_native_version)
#---RELAX---------------------------------------------------------------------------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment