Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add OPTIONS concat

Browse Source 
- remove whitespaces, hopefully fix CI
This commit is contained in:
Matthias Möller
2018-06-09 13:41:55 +02:00
parent 0113d98892
commit 5c31bdde8c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CI/ci-linux.sh
View File

@@ -11,14 +11,14 @@ MAKE_OPTIONS=""
BUILDPATH="" BUILDPATH=""
# set GTEST path # set GTEST path
OPTIONS = "$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.8.0/" OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.8.0/"
if [ "$COMPILER" == "gcc" ]; then if [ "$COMPILER" == "gcc" ]; then
echo "Building with GCC"; echo "Building with GCC";
BUILDPATH="gcc" BUILDPATH="gcc"
# without icecc: no options required # 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" MAKE_OPTIONS="-j16"
export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc

2
CI/ci-mac.sh
View File

@@ -12,7 +12,7 @@ export PATH
OPTIONS="" OPTIONS=""
# set GTEST path # 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 if [ "$LANGUAGE" == "C++98" ]; then
echo "Building with C++98"; echo "Building with C++98";