Commit 5c31bdde authored by Matthias Möller's avatar Matthias Möller

- add OPTIONS concat

- remove whitespaces, hopefully fix CI
parent 0113d988
Pipeline #7182 passed with stage
in 71 minutes and 3 seconds
......@@ -11,14 +11,14 @@ MAKE_OPTIONS=""
BUILDPATH=""
# set GTEST path
OPTIONS = "$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.8.0/"
OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.8.0/"
if [ "$COMPILER" == "gcc" ]; then
echo "Building with GCC";
BUILDPATH="gcc"
# without icecc: no options required
OPTIONS="-DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
MAKE_OPTIONS="-j16"
export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc
......
......@@ -12,7 +12,7 @@ export PATH
OPTIONS=""
# set GTEST path
OPTIONS = "$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
OPTIONS="$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
if [ "$LANGUAGE" == "C++98" ]; then
echo "Building with C++98";
......
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