mirror of
https://gitcode.com/gh_mirrors/ope/OpenFace.git
synced 2025-12-30 04:52:29 +00:00
More TBB search cleanup
This commit is contained in:
@@ -75,8 +75,6 @@ before_install:
|
||||
|
||||
script:
|
||||
- $CXX --version
|
||||
- ls /usr/local/Cellar/tbb/2018_U5
|
||||
- ls /usr/local/Cellar/tbb
|
||||
- cd lib/local/LandmarkDetector/model/patch_experts
|
||||
- wget https://www.dropbox.com/s/7na5qsjzz8yfoer/cen_patches_0.25_of.dat?dl=1
|
||||
- wget https://www.dropbox.com/s/k7bj804cyiu474t/cen_patches_0.35_of.dat?dl=1
|
||||
|
||||
@@ -149,8 +149,7 @@ if("${TBB_LIBRARIES}" STREQUAL "")
|
||||
# OS X
|
||||
set(TBB_DEFAULT_SEARCH_DIR
|
||||
"/opt/intel/tbb"
|
||||
"/usr/local/Cellar/tbb"
|
||||
"/usr/local/Cellar/tbb/2018_U5")
|
||||
"/usr/local/Cellar/tbb")
|
||||
|
||||
# TODO: Check to see which C++ library is being used by the compiler.
|
||||
if(NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 13.0)
|
||||
@@ -305,6 +304,4 @@ if("${TBB_LIBRARIES}" STREQUAL "")
|
||||
unset(TBB_LIB_PATH_SUFFIX)
|
||||
unset(TBB_DEFAULT_SEARCH_DIR)
|
||||
|
||||
else()
|
||||
MESSAGE("TBB already found")
|
||||
endif()
|
||||
Reference in New Issue
Block a user