Commit ff57039d authored by Andrea Valassi's avatar Andrea Valassi
Browse files

More fixes for ninja, remove from CMAKE_PREFIX_PATH on Linux


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20186 4525493e-7705-40b1-a816-d608a930855b
parent f016a2f0
......@@ -85,7 +85,7 @@ echo "INFO: set up CORAL/COOL for BINARY_TAG ${BINARY_TAG}"
# Set up CMAKE_PREFIX_PATH for the given release (CORALCOOL-2846)
# Keep both tcmalloc and gperftools for now (eventually drop tcmalloc)
# [NB CORAL is included, any local build must be prepended a posteriori]
for pkgname in ninja ccache Boost CppUnit expat frontier_client mysql oracle Python QMtest sqlite XercesC gperftools tcmalloc igprof libaio libunwind valgrind CORAL ROOT qt; do
for pkgname in ccache Boost CppUnit expat frontier_client mysql oracle Python QMtest sqlite XercesC gperftools tcmalloc igprof libaio libunwind valgrind CORAL ROOT qt; do
pkgpath=${lcgrel}/${pkgname}
if [ -d ${pkgpath} ]; then
export CMAKE_PREFIX_PATH=`find ${pkgpath} -mindepth 2 -maxdepth 2 -name ${BINARY_TAG}`:${CMAKE_PREFIX_PATH}
......@@ -253,6 +253,7 @@ fi
if [ `uname -s` != "Linux" ]; then
if [ -d ${lcgrel}/ninja ]; then
export PATH=`find ${lcgrel}/ninja -mindepth 2 -maxdepth 2 -name ${BINARY_TAG}`/bin:${PATH}
export CMAKE_PREFIX_PATH=`find ${lcgrel}/ninja -mindepth 2 -maxdepth 2 -name ${BINARY_TAG}`:${CMAKE_PREFIX_PATH}
fi
else
if [ -d /cvmfs/sft.cern.ch/lcg/contrib/ninja/1.4.0/x86_64-slc6 ]; then
......
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