Merge branch 'master' into dev

Author: costashatz

docs/advanced_installation.md

@@ -24,7 +24,7 @@ sudo apt-get install libeigen3-dev libboost-serialization-dev libboost-filesyste
 For OSX with brew:
 
 ```bash
-brew install eigen3
+brew install eigen
 brew install boost
 ```
 

scripts/install_deps.sh

@@ -98,4 +98,4 @@ cd deps/robot_dart
 ./waf
 ./waf install
 # go back to original directory
-cd ../..
+cd ../..

scripts/install_deps_all.sh

@@ -98,4 +98,4 @@ cd deps/robot_dart
 ./waf
 ./waf install
 # go back to original directory
-cd ../..
+cd ../..

scripts/install_deps_req.sh

@@ -5,7 +5,7 @@ echo "Detected OS: $OS"
 
 if [ $OS = "Darwin" ]; then
     echo "Installing for OSX via brew"
-    brew install cmake eigen3 boost
+    brew install cmake eigen boost tbb
     brew install autoconf automake
 else
     # check if we have Ubuntu or not
@@ -20,7 +20,7 @@ else
     echo "Installing for Ubuntu via apt-get"
     sudo apt-get -qq update
     # install Eigen 3, Boost
-    sudo apt-get --yes --force-yes install cmake libeigen3-dev libboost-serialization-dev libboost-filesystem-dev libboost-test-dev libboost-program-options-dev libboost-thread-dev libboost-regex-dev
+    sudo apt-get --yes --force-yes install cmake libeigen3-dev libtbb-dev libboost-serialization-dev libboost-filesystem-dev libboost-test-dev libboost-program-options-dev libboost-thread-dev libboost-regex-dev
     # install google tests for libcmaes
     sudo apt-get --yes --force-yes install libgtest-dev autoconf automake libtool libgoogle-glog-dev libgflags-dev
 fi
@@ -61,5 +61,7 @@ make install
 # go back to original directory
 cd ../..
 
-# just as fail-safe
-sudo ldconfig
+# just as fail-safe in Linux
+if [ $OS = "Linux" ]; then
+    sudo ldconfig
+fi