From 96fe0474e601ee2502ac5e26499d2f14bbf6f370 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Mon, 10 Jun 2019 10:22:25 -0400
Subject: [PATCH] Removed redundant flags. Add commented out code to turn off
 clang on Linux.

---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a18fd91ba..9d88f93ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,22 +38,22 @@ jobs:
   - stage: compile
     os: osx
     compiler: gcc
-    env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
+    env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
 # on Mac, CLANG
   - stage: compile
     os: osx
     compiler: clang
-    env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
+    env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
 # on Linux, GCC
   - stage: compile
     os: linux
     compiler: gcc
-    env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
+    env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
 # on Linux, CLANG
   - stage: compile
     os: linux
     compiler: clang
-    env: GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
+    env: GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
 # on Linux, with deprecated ON to make sure that path still compiles
   - stage: compile
     os: linux
@@ -69,7 +69,7 @@ compiler:
   - clang
 env:
   global:
-    - MAKEFLAGS="-j 2"
+    - MAKEFLAGS="-j2"
     - CCACHE_SLOPPINESS=pch_defines,time_macros
     - GTSAM_BUILD_UNSTABLE=ON
     - GTSAM_ALLOW_DEPRECATED_SINCE_V4=OFF
@@ -77,3 +77,8 @@ env:
     - GTSAM_BUILD_TESTS=OFF GTSAM_BUILD_EXAMPLES_ALWAYS=ON
     - GTSAM_BUILD_TESTS=ON GTSAM_BUILD_EXAMPLES_ALWAYS=OFF
 
+# Uncomment this if you want to exclude clang on linux
+# matrix:
+#   exclude:
+#   - os: linux
+#     compiler: clang