[Bf-blender-cvs] [9f8ae96ccc0] tmp_libupdate_34: Fix macOS build issues

[Brecht Van Lommel]

Commit: 9f8ae96ccc007cbe9744c97b7c36eb3e1a6dbff8
Author: Brecht Van Lommel
Date:   Wed Aug 17 23:04:11 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB9f8ae96ccc007cbe9744c97b7c36eb3e1a6dbff8

Fix macOS build issues

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

M	build_files/build_environment/cmake/check_software.cmake
M	build_files/cmake/platform/platform_apple.cmake

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

diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake
index 0756b058b2d..a72f12bbfc3 100644
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -14,12 +14,15 @@ if(UNIX)
     ${_libtoolize_name}
     meson
     ninja
-    patchelf
     pkg-config
     tclsh
     yasm
   )
 
+  if(NOT APPLE)
+    list(APPEND _required_software patchelf)
+  endif()
+
   foreach(_software ${_required_software})
     find_program(_software_find NAMES ${_software})
     if(NOT _software_find)
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 03fa2ada29a..becd6eebca2 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -336,6 +336,8 @@ if(WITH_OPENVDB)
   find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/openvdb/lib)
   if(BLOSC_LIBRARIES)
     list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
+  else()
+    unset(BLOSC_LIBRARIES CACHE)
   endif()
   set(OPENVDB_DEFINITIONS)
   add_bundled_libraries(openvdb)