Commit 610ebd22 authored by Andre Sailer's avatar Andre Sailer
Browse files

Merge branch 'CMake_setup_test' into 'master'

Update CMake path to use version 3.20.0

See merge request !971
parents e07192ba 5a1a5dcf
Pipeline #3144738 passed with stage
in 8 minutes and 6 seconds
......@@ -26,7 +26,7 @@ LCGPackage_Add(
IF NOT <VERSION> STREQUAL master AND <VERSION> VERSION_LESS v35r0 THEN
COMMAND ${EXEC} bash -c "cp -n -r <INSTALL_DIR>/*.cmake <INSTALL_DIR>/cmake"
ENDIF
DEPENDS Boost Python GSL ROOT clhep AIDA HepMC XercesC rangev3 cppgsl xenv six fmt
DEPENDS Boost Python GSL ROOT clhep AIDA HepMC XercesC rangev3 cppgsl xenv six fmt pytest
IF <VERSION> STREQUAL master OR <VERSION> VERSION_GREATER_EQUAL v35r0 THEN
jsonmcpp HepPDT CppUnit libunwind doxygen
IF NOT ${LCG_OS} MATCHES ubuntu THEN gperftools ENDIF
......
......@@ -47,7 +47,7 @@ if [[ $PLATFORM == *slc6* || $PLATFORM == *cc7* || $PLATFORM == *centos* || $PLA
# i686 special case: the newer cmake is a link to x86_64, might cause problems!!
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.3.2/Linux-i686/bin:${PATH}
else
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.18.3/Linux-${ARCH}/bin:${PATH}
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.20.0/Linux-${ARCH}/bin:${PATH}
fi
fi
......
Markdown is supported
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