Skip to content
Snippets Groups Projects
Commit c10b7345 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Merge branch 'LBCORE-1588' into 'master'

Force CMake to 3.3.2 for SLC5

Closes LBCORE-1588

See merge request !262
parents f3c8dab4 0afa585e
No related branches found
No related tags found
1 merge request!262Force CMake to 3.3.2 for SLC5
......@@ -592,7 +592,18 @@ class LbLoginScript(SourceScript):
appversion = opts.cmakevers[:lastdot-1] + '-' + opts.cmakevers[lastdot+1:]
subdir = "CMake/%s/Darwin/CMake %s.app/Contents/bin" % (opts.cmakevers, appversion)
elif sys.platform.startswith('linux'):
subdir = "CMake/%s/Linux-x86_64/bin" % opts.cmakevers
# Checking if we are on SLC5 to force CMake 3.3.2, the last one that we have that
# works there...
cmake_version = opts.cmakevers
try:
if not self._nativemachine :
self._nativemachine = NativeMachine()
dist = self._nativemachine.CMTNativeConfig().split('-')[1]
if dist == "slc5":
cmake_version = "3.3.2"
except:
pass
subdir = "CMake/%s/Linux-x86_64/bin" % cmake_version
else:
log.debug('CMake is not provided for platform %s', sys.platform)
return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment