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

specific paths for Mac, removed libtbb from travis packages list

release/4.3a0
Varun Agrawal 2020-03-26 21:00:23 -04:00
parent 4a356b9bd9
commit 34069a60df
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.sh
View File

@ -6,14 +6,10 @@ function install_tbb()
if [ $(uname -s) == "Linux" ]; then if [ $(uname -s) == "Linux" ]; then
wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz
tar -xf tbb44_20151115oss_lin.tgz tar -xf tbb44_20151115oss_lin.tgz
elif [ $(uname -s) == "Darwin" ]; then
wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz
tar -xf tbb44_20151115oss_osx.tgz
fi
# Variables needed for setting the correct library path
TBB_TARGET_ARCH="intel64"
TBBROOT=$(cd tbb44_20151115oss/bin && pwd -P)/.. TBBROOT=$(cd tbb44_20151115oss/bin && pwd -P)/..
TBB_TARGET_ARCH="intel64"
library_directory="${TBB_TARGET_ARCH}/gcc4.1" library_directory="${TBB_TARGET_ARCH}/gcc4.1"
# Set library paths # Set library paths
@ -21,6 +17,18 @@ function install_tbb()
MIC_LIBRARY_PATH="$TBBROOT/lib/mic:${MIC_LIBRARY_PATH}"; export MIC_LIBRARY_PATH MIC_LIBRARY_PATH="$TBBROOT/lib/mic:${MIC_LIBRARY_PATH}"; export MIC_LIBRARY_PATH
LD_LIBRARY_PATH="$TBBROOT/lib/$library_directory:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH LD_LIBRARY_PATH="$TBBROOT/lib/$library_directory:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH
LIBRARY_PATH="$TBBROOT/lib/$library_directory:${LIBRARY_PATH}"; export LIBRARY_PATH LIBRARY_PATH="$TBBROOT/lib/$library_directory:${LIBRARY_PATH}"; export LIBRARY_PATH
elif [ $(uname -s) == "Darwin" ]; then
wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz
tar -xf tbb44_20151115oss_osx.tgz
TBBROOT=$(cd tbb44_20151115oss/bin && pwd -P)/..
# Set library paths
LIBRARY_PATH="${TBBROOT}/lib:$LIBRARY_PATH"; export LIBRARY_PATH
DYLD_LIBRARY_PATH="${TBBROOT}/lib:$DYLD_LIBRARY_PATH"; export DYLD_LIBRARY_PATH
fi
CPATH="${TBBROOT}/include:$CPATH"; export CPATH CPATH="${TBBROOT}/include:$CPATH"; export CPATH
} }

1
.travis.yml
View File

@ -16,7 +16,6 @@ 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