add tbb to travis-ci

release/4.3a0
acxz 2020-01-12 11:34:02 -05:00
parent 7ebfdadb28
commit c9bcceef2f
1 changed files with 14 additions and 7 deletions

View File

@ -16,6 +16,7 @@ addons:
- cmake - cmake
- libpython-dev python-numpy - libpython-dev python-numpy
- libboost-all-dev - libboost-all-dev
- libtbb-dev
# before_install: # before_install:
# - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi
@ -43,7 +44,7 @@ jobs:
- stage: compile - stage: compile
os: osx os: osx
compiler: gcc compiler: gcc
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -b script: bash .travis.sh -b
- stage: compile - stage: compile
os: osx os: osx
@ -54,7 +55,7 @@ jobs:
- stage: compile - stage: compile
os: osx os: osx
compiler: clang compiler: clang
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -b script: bash .travis.sh -b
- stage: compile - stage: compile
os: osx os: osx
@ -65,7 +66,7 @@ jobs:
- stage: compile - stage: compile
os: linux os: linux
compiler: gcc compiler: gcc
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -b script: bash .travis.sh -b
- stage: compile - stage: compile
os: linux os: linux
@ -76,7 +77,7 @@ jobs:
- stage: compile - stage: compile
os: linux os: linux
compiler: clang compiler: clang
env: CC=clang-9 CXX=clang++-9 CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CC=clang-9 CXX=clang++-9 CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -b script: bash .travis.sh -b
- stage: compile - stage: compile
os: linux os: linux
@ -87,7 +88,13 @@ jobs:
- stage: special - stage: special
os: linux os: linux
compiler: clang compiler: clang
env: CC=clang-9 CXX=clang++-9 CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON env: CC=clang-9 CXX=clang++-9 CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_ALLOW_DEPRECATED_SINCE_V4=ON GTSAM_WITH_TBB=OFF
script: bash .travis.sh -b
# on Linux, with GTSAM_WITH_TBB not off to make sure GTSAM still compiles/tests
- stage: special
os: linux
compiler: gcc
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF
script: bash .travis.sh -b script: bash .travis.sh -b
# -------- STAGE 2: TESTS ----------- # -------- STAGE 2: TESTS -----------
# on Mac, GCC # on Mac, GCC
@ -99,7 +106,7 @@ jobs:
- stage: test - stage: test
os: osx os: osx
compiler: clang compiler: clang
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -t script: bash .travis.sh -t
- stage: test - stage: test
os: linux os: linux
@ -109,7 +116,7 @@ jobs:
- stage: test - stage: test
os: linux os: linux
compiler: gcc compiler: gcc
env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF env: CMAKE_BUILD_TYPE=Debug GTSAM_BUILD_UNSTABLE=OFF GTSAM_WITH_TBB=OFF
script: bash .travis.sh -t script: bash .travis.sh -t
- stage: test - stage: test
os: linux os: linux