diff --git a/.travis.sh b/.travis.sh index e08ab5a30..5f999e7a9 100755 --- a/.travis.sh +++ b/.travis.sh @@ -5,7 +5,7 @@ function install_tbb() { if [ "$(uname -s)" == "Linux" ]; then wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz -O /tmp/tbb442.tgz - tar -C /tmp -xvf /tmp/tbb442.tgz + tar -C /tmp -xf /tmp/tbb442.tgz TBBROOT=/tmp/tbb44_20151115oss @@ -20,7 +20,7 @@ function install_tbb() elif [ "$(uname -s)" == "Darwin" ]; then wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz -O /tmp/tbb442.tgz - tar -C /tmp -xvf /tmp/tbb442.tgz + tar -C /tmp -xf /tmp/tbb442.tgz TBBROOT=/tmp/tbb44_20151115oss @@ -51,8 +51,6 @@ function configure() export CXX=g++-$GCC_VERSION fi - install_tbb - # GTSAM_BUILD_WITH_MARCH_NATIVE=OFF: to avoid crashes in builder VMs cmake $SOURCE_DIR \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \ @@ -111,4 +109,7 @@ case $1 in -t) test ;; + -tbb) + install_tbb + ;; esac diff --git a/.travis.yml b/.travis.yml index 2de325818..7e5b33ec4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,9 @@ addons: - libpython-dev python-numpy - libboost-all-dev -# before_install: -# - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi +before_install: + - ./.travis.sh -tbb + # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi