Commit 68a271af authored by Sonja Happ's avatar Sonja Happ

remove ugly path to custom boost lib from build and install script

parent 12334eb4
......@@ -27,22 +27,6 @@ WITH_DB=false
WITH_VILLAS=false
HELP=false
#determine operating system (ubuntu or centos)
. /etc/os-release
OS=$NAME
echo Operating System is: $OS
BOOST_ROOT=""
if [ "${OS}" = "CentOS Linux" ]
then
#path to boost on CentOS cluster
BOOST_ROOT="/global/cluster/centos/boost_1_61_0_gcc_6.2.0"
fi
CMAKE_DEFINES="-DBOOST_ROOT:STRING=${BOOST_ROOT}"
echo CMake Defines: $CMAKE_DEFINES
for i in "$@"
do
case $i in
......@@ -75,25 +59,20 @@ else
echo Executing Pre Build commands ...
if [ "$WITH_DB" = true ] && [ "$WITH_VILLAS" = true ]
then
cmake ${CMAKE_DEFINES} -DWITH_DB=1 -DWITH_VILLAS=1 ..
cmake -DWITH_DB=1 -DWITH_VILLAS=1 ..
elif [ "$WITH_DB" = true ] && [ "$WITH_VILLAS" = false ]
then
cmake ${CMAKE_DEFINES} -DWITH_DB=1 -DWITH_VILLAS=0 ..
cmake -DWITH_DB=1 -DWITH_VILLAS=0 ..
elif [ "$WITH_DB" = false ] && [ "$WITH_VILLAS" = true ]
then
cmake ${CMAKE_DEFINES} -DWITH_DB=0 -DWITH_VILLAS=1 ..
cmake -DWITH_DB=0 -DWITH_VILLAS=1 ..
elif [ "$WITH_DB" = false ] && [ "$WITH_VILLAS" = false ]
then
cmake ${CMAKE_DEFINES} -DWITH_DB=0 -DWITH_VILLAS=0 ..
cmake -DWITH_DB=0 -DWITH_VILLAS=0 ..
fi
echo Done
echo Executing Build commands ...
if [ "${OS}" = "CentOS Linux" ]
then
make -j
else
make
fi
make -j
echo Done
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