Commit 34c9a348 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Use AFS in cmake builds if there is no cvmfs (e.g. on buildcoverity, SPI-863).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19886 4525493e-7705-40b1-a816-d608a930855b
parent d2151f94
......@@ -61,7 +61,11 @@ endif
# Use ninja for faster builds (make for top-level commands, ninja internally)!
# [moved here from setupCmake.sh to use it also in lcgcmake (SPI-854)]
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
NINJADIR := /cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6
ifeq ($(wildcard $(NINJADIR)),)
NINJADIR := /afs/cern.ch/sw/lcg/contrib/ninja/1.4.0/x86_64-slc6
endif
export PATH := $(NINJADIR):$(PATH)
NINJA := $(shell env PATH=$(NINJADIR):$(PATH) which ninja 2> /dev/null)
###NINJA := $(shell which ninja 2> /dev/null)
......@@ -121,9 +125,15 @@ $(info ----> Using CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE))
override CMAKEFLAGS += '-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)'
# Set a _single_ path to _all_ lcg-gcc-x.y.z compilers
# Ensure that lcg-gcc-x.y.z use compilers from cvmfs and not AFS (LBCORE-867)
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
# Ensure that lcg-gcc-x.y.z scripts work correctly on CentOS7 (CORALCOOL-2811)
export PATH := /cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/prod/InstallArea/scripts:$(PATH)
LBSCRIPTS := /cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/prod/InstallArea/scripts
ifeq ($(wildcard $(LBSCRIPTS)),)
LBSCRIPTS := /afs/cern.ch/lhcb/software/releases/LBSCRIPTS/prod/InstallArea/scripts
else
export LCG_release_area := /cvmfs/sft.cern.ch/lcg/releases
endif
export PATH := $(LBSCRIPTS):$(PATH)
ifeq ($(shell lsb_release -si),CentOS)
export LCG_hostos := $(shell uname -i)-cc$(firstword $(subst ., ,$(shell lsb_release -sr)))
else
......
......@@ -22,11 +22,12 @@ if [ "$*" != "" ]; then
fi
# Set path to CMake 3.3.2 from /cvmfs/sft.cern.ch/lcg/contrib
# Alternative: use 2.8.9 from /cvmfs/lhcb.cern.ch/lib/contrib (LHCb recipe)
# Alternative: use 2.8.12.2 from /afs/cern.ch/sw/lcg/contrib (PH-SFT recipe)
# Alternative: use 3.1.0 from /afs/cern.ch/sw/lcg/contrib (LHCb alternative)
# Alternative: use 3.2.3 from /cvmfs/sft.cern.ch/lcg/contrib (previous default)
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.3.2/Linux-x86_64/bin:$PATH
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
if [ -d /cvmfs ]; then
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/CMake/3.3.2/Linux-x86_64/bin:$PATH
else
export PATH=/afs/cern.ch/sw/lcg/contrib/CMake/3.3.2/Linux-x86_64/bin:$PATH
fi
# Set a _single_ path to _all_ lcg-gcc-x.y.z compilers (LHCb recipe),
# so that the correct compiler will then be used depending on BINARY_TAG
......@@ -93,7 +94,12 @@ export CCACHE_DIR=$topdir/.ccache # keep this here to allow interactive queries
# Relocate paths below LCG_releases_base (CORALCOOL-2829)
# Use the new simpler cmake infrastructure in production (CORALCOOL-2847)
# by setting the path to the the LCG summary file for the desired release
export LCG_releases_base=/cvmfs/sft.cern.ch/lcg/releases/LCG_${lcg_xx}
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
if [ -d /cvmfs ]; then
export LCG_releases_base=/cvmfs/sft.cern.ch/lcg/releases/LCG_${lcg_xx}
else
export LCG_releases_base=/afs/cern.ch/sw/lcg/releases/LCG_${lcg_xx}
fi
export CORALCOOL_CMAKE_LCGSUMMARY=${LCG_releases_base}/LCG_externals_${BINARY_TAG}.txt
# Test passing CMAKE_CXX_FLAGS as in lcgcmake
......
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