[Bf-blender-cvs] [0c75a98561d] master: CMake: disable TBB when not found

Campbell Barton noreply at git.blender.org
Tue Jun 15 16:19:27 CEST 2021


Commit: 0c75a98561d33630af198e10d33a235bf9f320c7
Author: Campbell Barton
Date:   Wed Jun 16 00:02:39 2021 +1000
Branches: master
https://developer.blender.org/rB0c75a98561d33630af198e10d33a235bf9f320c7

CMake: disable TBB when not found

===================================================================

M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_unix.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index fe9dd6a58de..90188751fc0 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -388,6 +388,10 @@ endif()
 
 if(WITH_TBB)
   find_package(TBB)
+  if(NOT TBB_FOUND)
+    message(WARNING "TBB not found, disabling WITH_TBB")
+    set(WITH_TBB OFF)
+  endif()
 endif()
 
 if(WITH_POTRACE)
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index fcfde5a07ba..7f62399ac4f 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -457,6 +457,10 @@ endif()
 
 if(WITH_TBB)
   find_package_wrapper(TBB)
+  if(NOT TBB_FOUND)
+    message(WARNING "TBB not found, disabling WITH_TBB")
+    set(WITH_TBB OFF)
+  endif()
 endif()
 
 if(WITH_XR_OPENXR)



More information about the Bf-blender-cvs mailing list