Commit 24629cd1 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Move ninja PATH to setupCMake.sh, lcgcmake uses its own (CORALCOOL-2912)


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20109 4525493e-7705-40b1-a816-d608a930855b
parent ececcbd4
......@@ -63,17 +63,8 @@ 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)
# The hardcoded ninja path is valid on Linux but not on Darwin (CORALCOOL-2911)
ifeq ($(shell uname -s),Linux)
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)
endif
NINJA := $(shell env PATH=$(NINJADIR):$(PATH) which ninja 2> /dev/null)
###NINJA := $(shell which ninja 2> /dev/null)
# [moved back there so that lcgcmake uses its own ninja (CORALCOOL-2912)]
NINJA := $(shell which ninja 2> /dev/null)
$(info -- Using NINJA=$(NINJA))
# Use ccache for faster builds (avoid recompiling unchanged source files)!
......
......@@ -78,7 +78,16 @@ export CCACHE_CONFIGPATH=$CCACHE_DIR/ccache.conf
# Use ninja for faster builds (make for top-level commands, ninja internally)!
# [moved from here to Makefile to use it also in nightlies (SPI-854)]
###export PATH=/cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6:$PATH
# [moved back here so that lcgcmake uses its own ninja (CORALCOOL-2912)]
# Use AFS if no cvmfs (e.g. on buildcoverity, SPI-863)
# The hardcoded ninja path is valid on Linux but not on Darwin (CORALCOOL-2911)
if [ `uname -s` == "Linux" ]; then
if [ -d /cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6 ]; then
export PATH=/cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6:$PATH
else
export PATH=/afs/cern.ch/sw/lcg/contrib/ninja/1.4.0/x86_64-slc6:$PATH
fi
fi
# Optionally override build directory location
# Use absolute paths or paths relative to the _source_ directory!
......
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