diff --git a/.travis.sh b/.travis.sh index 8fdf27bd3..1f681043a 100755 --- a/.travis.sh +++ b/.travis.sh @@ -6,21 +6,29 @@ function install_tbb() if [ $(uname -s) == "Linux" ]; then wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz tar -xf tbb44_20151115oss_lin.tgz + + TBBROOT=$(cd tbb44_20151115oss/bin && pwd -P)/.. + + TBB_TARGET_ARCH="intel64" + library_directory="${TBB_TARGET_ARCH}/gcc4.1" + + # Set library paths + MIC_LD_LIBRARY_PATH="$TBBROOT/lib/mic:${MIC_LD_LIBRARY_PATH}"; export MIC_LD_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 + 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 - # Variables needed for setting the correct library path - TBB_TARGET_ARCH="intel64" - TBBROOT=$(cd tbb44_20151115oss/bin && pwd -P)/.. - library_directory="${TBB_TARGET_ARCH}/gcc4.1" - - # Set library paths - MIC_LD_LIBRARY_PATH="$TBBROOT/lib/mic:${MIC_LD_LIBRARY_PATH}"; export MIC_LD_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 - LIBRARY_PATH="$TBBROOT/lib/$library_directory:${LIBRARY_PATH}"; export LIBRARY_PATH CPATH="${TBBROOT}/include:$CPATH"; export CPATH } diff --git a/.travis.yml b/.travis.yml index 870a4bdb9..2de325818 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ addons: - cmake - libpython-dev python-numpy - libboost-all-dev - - libtbb-dev # before_install: # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi