Commit 41419f39 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'CI' into 'master'

Ci

Include CI for Comiso

See merge request !4
parents 514996d6 0fe4d463
Pipeline #229 failed with stage
gcc-c++11:
script: "CI/ci-linux.sh gcc C++11"
tags:
- Linux
clang-c++11:
script: "CI/ci-linux.sh clang C++11"
tags:
- Linux
gcc-c++98:
script: "CI/ci-linux.sh gcc C++98"
tags:
- Linux
clang-c++98:
script: "CI/ci-linux.sh clang C++98"
tags:
- Linux
macos-c++11:
script: "CI/ci-mac.sh C++11"
tags:
- Apple
macos-c++98:
script: "CI/ci-mac.sh C++98"
tags:
- Apple
#!/bin/bash
COMPILER=$1
LANGUAGE=$2
# Exit script on any error
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-$BUILDPATH ]; then
mkdir build-release-$BUILDPATH
fi
cd build-release-$BUILDPATH
cmake -DCMAKE_BUILD_TYPE=Release -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
#build it
make
cd ..
#########################################
# Build Debug version and Unittests
#########################################
if [ ! -d build-debug-$BUILDPATH ]; then
mkdir build-debug-$BUILDPATH
fi
cd build-debug-$BUILDPATH
cmake -DCMAKE_BUILD_TYPE=Debug -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
make
#!/bin/bash
#Exit on any error
set -e
LANGUAGE=$1
echo "============================="
echo "Build information"
echo "============================="
PATH=$PATH:/opt/local/bin
export PATH
OPTIONS=""
if [ "$LANGUAGE" == "C++98" ]; then
echo "Building with C++98";
elif [ "$LANGUAGE" == "C++11" ]; then
echo "Building with C++11";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
fi
echo "============================="
echo "Software Directory content: "
echo "============================="
ls ~/sw
echo "============================="
echo "Starting Build: "
echo "============================="
#########################################
# Build release version
#########################################
if [ ! -d build-release ]; then
mkdir build-release
fi
cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
#build it
make
cd ..
#########################################
# Build Debug version and Unittests
#########################################
if [ ! -d build-debug ]; then
mkdir build-debug
fi
cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
#build it
make
......@@ -422,7 +422,7 @@ acg_print_configure_header (COMISO "CoMISo")
# write config file
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/Config/config.hh.in"
"Config/config.hh" @ONLY IMMEDIATE)
"CoMISo/Config/config.hh" @ONLY IMMEDIATE)
......
......@@ -16,7 +16,9 @@ find_path( GMM_INCLUDE_DIR
/usr/include
/usr/include
/usr/local/include
~/sw/gmm-4.3/include
~/sw/gmm-4.1/include
"c:\\libs\\gmm-4.3\\include"
"c:\\libs\\gmm-4.1\\include"
"c:\\libs\\gmm-3.0\\include"
${PROJECT_SOURCE_DIR}/MacOS/Libs/gmm-3.1/include
......
Supports Markdown
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