diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-27 14:26:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-27 14:27:35 +0300 |
| commit | 1f954649c409a50a2a99d94fa3d4fccb9b381b72 (patch) | |
| tree | 5ca5ac501d7a90aa1cdb4a7a75251256d7908d9a /CMakeLists.txt | |
| parent | b871160dd962ac05b31456bc2f4c8f8fd45a839d (diff) | |
OpenVDB: Get rid of hardcoded TBB variables and enabled for Linux buildbot
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a059cb0ef1..014401a7b13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1063,19 +1063,11 @@ if(UNIX AND NOT APPLE) if(WITH_OPENVDB) find_package_wrapper(OpenVDB) - - set(TBB ${LIBDIR}/tbb) - set(TBB_LIBRARIES tbb) - set(TBB_LIBPATH ${TBB}/lib) - - set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARIES} ${BOOST_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES}) - set(OPENVDB_LIBPATH) # TODO, remove and reference the absolute path everywhere - set(OPENVDB_DEFINITIONS) - - if(NOT OPENVDB_FOUND) + find_package_wrapper(TBB) + if(NOT OPENVDB_FOUND OR NOT TBB_FOUND) set(WITH_OPENVDB OFF) set(WITH_OPENVDB_BLOSC OFF) - message(STATUS "OpenVDB not found") + message(STATUS "OpenVDB not found, disabling it") endif() endif() |