Removed redundant flags.

Add commented out code to turn off clang on Linux.
release/4.3a0
Frank Dellaert 2019-06-10 10:22:25 -04:00
parent 7cee39f482
commit 96fe0474e6
1 changed files with 10 additions and 5 deletions

View File

@ -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