Add a build step to test non freetype builds (#6908)

* Add a build step to test non freetype builds

diff --git a/.travis.yml b/.travis.yml
index 77c405b69c42fd630038afbfb5a850881f5e5b36..0fb29fc7dcfe6fcfd5099dec779c698509e6b1bc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,15 @@ matrix:
           sources: &sources
             - llvm-toolchain-trusty-5.0
 
+    - env: PLATFORM=Unix COMPILER=clang-5.0 FREETYPE=0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-5.0', 'clang++-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
     - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1
       compiler: clang
       os: linux

diff --git a/util/travis/script.sh b/util/travis/script.sh
index e5be1fe3268157cab1b62a0624e2207c27e9fad1..c68638db4acccdece550c11187b57d4707fb120b 100755 (executable)
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -22,6 +22,10 @@ if [[ ${PLATFORM} == "Unix" ]]; then
                CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext'
        fi
 
+       if [[ -n "${FREETYPE}" ]] && [[ "${FREETYPE}" == "0" ]]; then
+               CMAKE_FLAGS+=' -DENABLE_FREETYPE=0'
+       fi
+
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DRUN_IN_PLACE=TRUE \
                -DENABLE_GETTEXT=TRUE \