Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt14
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()