From 54d14e6e3b92c6b8dbfe9ab0a6002af7a52ac995 Mon Sep 17 00:00:00 2001
From: Turo Lamminen <turotl@gmail.com>
Date: Sat, 7 Oct 2017 14:47:52 +0300
Subject: [PATCH] Travis: Refactor how we build CMake options
---
.travis.sh | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/.travis.sh b/.travis.sh
index 1ab1ee2b1..1c7c4e13e 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,6 +1,32 @@
function generate()
{
- cmake -G "Unix Makefiles" -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD -DASSIMP_COVERALLS=$ENABLE_COVERALLS -DASSIMP_WERROR=ON -DASSIMP_ASAN=$ASAN
+ OPTIONS="-DASSIMP_WERROR=ON"
+
+ if [ "$TRAVIS_NO_EXPORT" = "YES" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=YES"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=NO"
+ fi
+
+ if [ "$SHARED_BUILD" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=ON"
+ else
+ OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=OFF"
+ fi
+
+ if [ "$ENABLE_COVERALLS" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_COVERALLS=ON"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_COVERALLS=OFF"
+ fi
+
+ if [ "$ASAN" = "ON" ] ; then
+ OPTIONS="$OPTIONS -DASSIMP_ASAN=ON"
+ else
+ OPTIONS="$OPTIONS -DASSIMP_ASAN=OFF"
+ fi
+
+ cmake -G "Unix Makefiles" $OPTIONS
}
if [ $ANDROID ]; then
--
GitLab