Commit: b5a860c9cc023d5aa8708e06e33efa2229dd5047
Author: Guillermo S. Romero
Date: Tue Jan 15 11:13:31 2019 +1100
Branches: master
https://developer.blender.org/rBb5a860c9cc023d5aa8708e06e33efa2229dd5047
CMake: Improve handling of missing TBB & OpenVDB
===================================================================
M build_files/cmake/platform/platform_unix.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_unix.cmake
b/build_files/cmake/platform/platform_unix.cmake
index f9ea9420e97..b2f880ab8b3 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -245,13 +245,17 @@ if(WITH_OPENVDB)
find_package_wrapper(OpenVDB)
find_package_wrapper(TBB)
find_package_wrapper(Blosc)
- if(NOT OPENVDB_FOUND OR NOT TBB_FOUND)
+ if(NOT TBB_FOUND)
+ set(WITH_OPENVDB OFF)
+ set(WITH_OPENVDB_BLOSC OFF)
+ message(STATUS "TBB not found, disabling OpenVDB")
+ elseif(NOT OPENVDB_FOUND)
set(WITH_OPENVDB OFF)
set(WITH_OPENVDB_BLOSC OFF)
message(STATUS "OpenVDB not found, disabling it")
elseif(NOT BLOSC_FOUND)
set(WITH_OPENVDB_BLOSC OFF)
- message(STATUS "Blosc not found, disabling it")
+ message(STATUS "Blosc not found, disabling it for OpenVBD")
endif()
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
