[Bf-blender-cvs] [fd73e63dd2a] tmp_libupdate_34: Remove blosc as direct dependency, it's inside the openvdb shared library

[Brecht Van Lommel]

Commit: fd73e63dd2ab3ad179514057344a8dc552e82887
Author: Brecht Van Lommel
Date:   Tue Aug 16 00:52:34 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rBfd73e63dd2ab3ad179514057344a8dc552e82887

Remove blosc as direct dependency, it's inside the openvdb shared library

Don't harvest and don't link blender to it.

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

M	build_files/build_environment/cmake/blosc.cmake
M	build_files/build_environment/cmake/harvest.cmake
M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_unix.cmake
M	intern/cycles/cmake/external_libs.cmake
M	intern/cycles/cmake/macros.cmake

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

diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake
index 7dfa8853a8a..72368808744 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -38,19 +38,3 @@ if(WIN32)
     external_pthreads
   )
 endif()
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_blosc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_blosc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 3ec5b623a99..4dac94b61a5 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -115,9 +115,6 @@ harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
   harvest(openal/lib openal/lib "*.a")
 
-  harvest(blosc/include blosc/include "*.h")
-  harvest(blosc/lib blosc/lib "*.a")
-
   harvest(zlib/include zlib/include "*.h")
   harvest(zlib/lib zlib/lib "*.a")
 
@@ -126,7 +123,6 @@ if(UNIX AND NOT APPLE)
 
   harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
 else()
-  harvest(blosc/lib openvdb/lib "*.a")
   harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index aeb789235af..1eb3a8d33c7 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -312,9 +312,6 @@ endif()
 
 if(WITH_OPENVDB)
   find_package(OpenVDB)
-  find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/openvdb/lib)
-  print_found_status("Blosc" "${BLOSC_LIBRARIES}")
-  list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
   set(OPENVDB_DEFINITIONS)
 endif()
 
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 7d24959ed88..9b992cfbabf 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -307,15 +307,17 @@ endif()
 
 if(WITH_OPENVDB)
   find_package_wrapper(OpenVDB)
-  find_package_wrapper(Blosc)
 
   if(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 for OpenVBD")
+  else if(NOT EXISTS ${LIBDIR})
+    find_package_wrapper(Blosc)
+    if(NOT BLOSC_FOUND)
+      set(WITH_OPENVDB_BLOSC OFF)
+      message(STATUS "Blosc not found, disabling it for OpenVBD")
+    endif()
   endif()
 endif()
 
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 51830250f2e..4a6dd8659df 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -67,7 +67,6 @@ if(CYCLES_STANDALONE_REPOSITORY)
   if(EXISTS ${_cycles_lib_dir})
     _set_default(ALEMBIC_ROOT_DIR "${_cycles_lib_dir}/alembic")
     _set_default(BOOST_ROOT "${_cycles_lib_dir}/boost")
-    _set_default(BLOSC_ROOT_DIR "${_cycles_lib_dir}/blosc")
     _set_default(EMBREE_ROOT_DIR "${_cycles_lib_dir}/embree")
     _set_default(IMATH_ROOT_DIR "${_cycles_lib_dir}/imath")
     _set_default(GLEW_ROOT_DIR "${_cycles_lib_dir}/glew")
@@ -438,15 +437,6 @@ if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OPENVDB)
 
   if(NOT USD_OVERRIDE_OPENVDB)
     find_package(OpenVDB REQUIRED)
-
-    if(MSVC AND EXISTS ${_cycles_lib_dir})
-      set(BLOSC_LIBRARY
-        optimized ${BLOSC_ROOT_DIR}/lib/libblosc.lib
-        debug ${BLOSC_ROOT_DIR}/lib/libblosc_d.lib
-      )
-    else()
-      find_package(Blosc REQUIRED)
-    endif()
   endif()
 endif()
 
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake
index abadfc2c1ac..91ced0ceff6 100644
--- a/intern/cycles/cmake/macros.cmake
+++ b/intern/cycles/cmake/macros.cmake
@@ -107,7 +107,7 @@ macro(cycles_external_libraries_append libraries)
     endif()
   endif()
   if(WITH_OPENVDB)
-    list(APPEND ${libraries} ${OPENVDB_LIBRARIES} ${BLOSC_LIBRARIES})
+    list(APPEND ${libraries} ${OPENVDB_LIBRARIES})
   endif()
   if(WITH_OPENIMAGEDENOISE)
     list(APPEND ${libraries} ${OPENIMAGEDENOISE_LIBRARIES})