ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2025-12-30 13:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try being better at finding TBB in OS X.

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2018-06-27 20:25:04 +02:00
parent a4e88ffb8d
commit 9d8b37663a
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@@ -21,8 +21,8 @@ before_install:
- if [ ${TRAVIS_OS_NAME} = linux ]; then
sudo apt-get update;
sudo apt-get install libopenblas-dev libopenblas-base;
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev checkinstall;
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev;
sudo apt-get install cmake;
sudo apt-get install libboost-all-dev;
wget http://dlib.net/files/dlib-19.13.tar.bz2;
@@ -68,15 +68,7 @@ before_install:
brew update;
brew install tbb;
brew install openblas;
wget http://dlib.net/files/dlib-19.13.tar.bz2;
tar xf dlib-19.13.tar.bz2;
cd dlib-19.13;
mkdir build;
cd build;
cmake ..;
cmake --build . --config Release;
sudo make install;
cd ../..;
brew install dlib;
brew install opencv3;
brew upgrade boost;
fi

8
CMakeLists.txt
View File

@@ -40,12 +40,14 @@ MESSAGE(" Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
MESSAGE(" Boost_LIBRARIES: ${Boost_LIBRARIES}")
MESSAGE(" Boost_LIBRARY_DIRS: ${Boost_LIBRARY_DIRS}")
# Try finding TBB in default location
find_package( TBB CONFIG )
if (NOT ${TBB_FOUND})
# If not found, use FindTBB.cmake
if (NOT ${TBB_FOUND} OR NOT ${TBB_LIBRARIES})
find_package( TBB REQUIRED )
else()
MESSAGE("TBB found in CONFIG: ${TBB_DIR}")
MESSAGE("TBB found in CONFIG: ${TBB_LIBRARIES}")
endif()
MESSAGE("TBB information:")