From e98102162fccc9d6c99052f91211f3a09b95cdf8 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 30 Jan 2018 16:37:45 +0100
Subject: [PATCH] Fix -Werror in Travis, env gets overriden

Prevents #1197 from happening again.
---
 .travis.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee8e3dab..f7ce408c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,16 @@ addons:
             - libxinerama-dev
             - libxcursor-dev
             - libxi-dev
-env:
-    global:
-        - CFLAGS=-Werror
 matrix:
     include:
         - os: linux
-          env: BUILD_SHARED_LIBS=ON
+          env:
+              - BUILD_SHARED_LIBS=ON
+              - CFLAGS=-Werror
         - os: linux
-          env: BUILD_SHARED_LIBS=OFF
+          env:
+              - BUILD_SHARED_LIBS=OFF
+              - CFLAGS=-Werror
         - os: linux
           sudo: required
           addons:
@@ -34,6 +35,7 @@ matrix:
           env:
               - USE_WAYLAND=ON
               - BUILD_SHARED_LIBS=ON
+              - CFLAGS=-Werror
         - os: linux
           sudo: required
           addons:
@@ -45,10 +47,15 @@ matrix:
           env:
               - USE_WAYLAND=ON
               - BUILD_SHARED_LIBS=OFF
+              - CFLAGS=-Werror
         - os: osx
-          env: BUILD_SHARED_LIBS=ON
+          env:
+              - BUILD_SHARED_LIBS=ON
+              - CFLAGS=-Werror
         - os: osx
-          env: BUILD_SHARED_LIBS=OFF
+          env:
+              - BUILD_SHARED_LIBS=OFF
+              - CFLAGS=-Werror
 script:
     - if grep -Inr '\s$' src include docs tests examples CMake *.md .gitattributes .gitignore; then echo Trailing whitespace found, aborting.; exit 1; fi
     - mkdir build