diff --git a/.travis.yml b/.travis.yml index e0b69339..bfe6a4ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index 13751691..d0a88c85 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -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() \ No newline at end of file