Commit 89273cb1 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'cpp11-tests-on-mac' into 'master'

Test Builds with c++11 on mac



See merge request !20
parents 4f0f4a9c b8460a7a
Pipeline #15 passed with stage
...@@ -18,7 +18,12 @@ clang-c++98: ...@@ -18,7 +18,12 @@ clang-c++98:
tags: tags:
- Linux - Linux
macos: macos-c++11:
script: "CI/ci-mac.sh" script: "CI/ci-mac.sh C++11"
tags:
- Apple
macos-c++98:
script: "CI/ci-mac.sh C++98"
tags: tags:
- Apple - Apple
#!/bin/bash #!/bin/bash
LANGUAGE=$1
PATH=$PATH:/opt/local/bin PATH=$PATH:/opt/local/bin
export PATH 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
######################################### #########################################
# Build release version # Build release version
######################################### #########################################
...@@ -13,7 +25,7 @@ fi ...@@ -13,7 +25,7 @@ fi
cd build-release cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE ../ cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE $OPTIONS ../
#build it #build it
make make
...@@ -44,7 +56,7 @@ fi ...@@ -44,7 +56,7 @@ fi
cd build-debug cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE ../ cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE $OPTIONS ../
#build the unit tests #build the unit tests
make unittests make unittests
......
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