From 54dad6c72a5bee45c73dce34d6a0520d01508d57 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 4 Feb 2018 18:21:57 -0700 Subject: [PATCH] travis: Oops, fix the CMake travis.yml config somewhat --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a5deba8a3..2f48634bcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,23 +13,22 @@ matrix: - export CXX=g++-4.7 - compiler: gcc dist: precise - env: BUILDSYSTEM=cmake FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives + env: BUILDSYSTEM=cmake PYTHONV=python2.7 FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives before_install: - export CC=gcc-4.7 - export CXX=g++-4.7 - compiler: clang dist: precise - env: BUILDSYSTEM=cmake FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives + env: BUILDSYSTEM=cmake PYTHONV=python3 FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives - compiler: gcc dist: trusty - env: BUILDSYSTEM=cmake FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives + env: BUILDSYSTEM=cmake PYTHONV=python3 FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives before_install: - export CC=gcc-4.7 - export CXX=g++-4.7 - compiler: clang dist: trusty - env: BUILDSYSTEM=cmake FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives - env: PYTHONV=python2.7 FLAGS=--override=STDFLOAT_DOUBLE=1 + env: BUILDSYSTEM=cmake PYTHONV=python2.7 FLAGS=-DCOMPOSITE_SOURCE_LIMIT=0 # Disable unity builds to catch missing #include directives addons: apt: sources: