12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install tbb as part of configure

release/4.3a0
Varun Agrawal 2020-03-28 06:56:58 -04:00
parent 8dc7359924
commit d608611c87
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.sh
View File

@ -46,6 +46,8 @@ function configure()
rm -fr $BUILD_DIR || true rm -fr $BUILD_DIR || true
mkdir $BUILD_DIR && cd $BUILD_DIR mkdir $BUILD_DIR && cd $BUILD_DIR
install_tbb
if [ ! -z "$GCC_VERSION" ]; then if [ ! -z "$GCC_VERSION" ]; then
export CC=gcc-$GCC_VERSION export CC=gcc-$GCC_VERSION
export CXX=g++-$GCC_VERSION export CXX=g++-$GCC_VERSION
@ -109,7 +111,4 @@ case $1 in
-t) -t)
test test
;; ;;
-tbb)
install_tbb
;;
esac esac

1
.travis.yml
View File

@ -23,7 +23,6 @@ addons:
install: install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache ; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
- source .travis.sh -tbb
# We first do the compile stage specified below, then the matrix expansion specified after. # We first do the compile stage specified below, then the matrix expansion specified after.
stages: stages: