specific paths for Mac, removed libtbb from travis packages list

.travis.sh

@@ -6,14 +6,10 @@ 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
-  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)/..
+
+    TBB_TARGET_ARCH="intel64"
     library_directory="${TBB_TARGET_ARCH}/gcc4.1"
 
     # Set library paths
@@ -21,6 +17,18 @@ function install_tbb()
     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
+
   CPATH="${TBBROOT}/include:$CPATH"; export CPATH
 }
 

.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