From 7fc4253eaba2496ee6215dc8f879e82cd9b0d0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 26 Nov 2015 12:20:39 +0100 Subject: [PATCH] Updated linux ci script --- CI/ci-linux.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh index 84455a33..c9ae618d 100755 --- a/CI/ci-linux.sh +++ b/CI/ci-linux.sh @@ -7,30 +7,35 @@ LANGUAGE=$2 set -e OPTIONS="" +BUILDPATH="" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; + BUILDPATH="gcc" elif [ "$COMPILER" == "clang" ]; then OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang" echo "Building with CLANG"; + BUILDPATH="clang" fi if [ "$LANGUAGE" == "C++98" ]; then echo "Building with C++98"; + BUILDPATH="$BUILDPATH-cpp98" elif [ "$LANGUAGE" == "C++11" ]; then echo "Building with C++11"; OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' " + BUILDPATH="$BUILDPATH-cpp11" fi ######################################### # Make release build folder -if [ ! -d build-release ]; then - mkdir build-release +if [ ! -d build-release-$BUILDPATH ]; then + mkdir build-release-$BUILDPATH fi -cd build-release +cd build-release-$BUILDPATH cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON $OPTIONS ../ @@ -63,11 +68,11 @@ cd .. # Build Debug version and Unittests ######################################### -if [ ! -d build-debug ]; then - mkdir build-debug +if [ ! -d build-debug-$BUILDPATH ]; then + mkdir build-debug-$BUILDPATH fi -cd build-debug +cd build-debug-$BUILDPATH cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON $OPTIONS ../