From 7e50529867d4ad0e405f0d850a3d2a1a08d0121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Fri, 12 Jan 2018 15:36:54 +0100 Subject: [PATCH] Add a build step to test non freetype builds (#6908) * Add a build step to test non freetype builds --- .travis.yml | 9 +++++++++ util/travis/script.sh | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 77c405b69..0fb29fc7d 100644 --- 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 e5be1fe32..c68638db4 100755 --- 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 \