Commit 08d012c2 authored by Richard Bachmann's avatar Richard Bachmann
Browse files

Merge branch 'dev4_ROOT_to_v6-20-00-patches' into 'master'

Updates ROOT branch to v6-20-00-patches

See merge request !325
parents 2dd88165 cdaf489a
Pipeline #1341147 passed with stage
in 5 minutes and 17 seconds
......@@ -5,7 +5,7 @@ include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
# Latest tagged version of COOL, CORAL instead of master (if required)
......
......@@ -22,7 +22,7 @@ if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18|mac[0-9]+)
endif()
#---Overwrites and additional packages ----------------------------
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
LCG_external_package(cuda 10.0 )
......
......@@ -5,7 +5,7 @@ include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
# Latest tagged version of COOL, CORAL instead of master (if required)
......
......@@ -5,7 +5,7 @@ include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
# Latest tagged version of COOL, CORAL instead of master (if required)
......
......@@ -5,7 +5,7 @@ include(heptools-dev-base)
#---Additional External packages------(Generators)-----------------
include(heptools-dev-generators)
LCG_external_package(ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git )
LCG_external_package(hepmc3 3.1.1 )
# Latest tagged version of COOL, CORAL instead of master (if required)
......
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