Commit: 01d764f27a72f52a45176676d3c7927720d8eaaf Author: Brecht Van Lommel Date: Tue Aug 16 01:01:54 2022 +0200 Branches: tmp_libupdate_34 https://developer.blender.org/rB01d764f27a72f52a45176676d3c7927720d8eaaf
Add automatic upgrade of cmake cache on Linux/macOS =================================================================== M build_files/cmake/platform/platform_old_libs_update.cmake =================================================================== diff --git a/build_files/cmake/platform/platform_old_libs_update.cmake b/build_files/cmake/platform/platform_old_libs_update.cmake index f0ca930bb39..09c15ce1681 100644 --- a/build_files/cmake/platform/platform_old_libs_update.cmake +++ b/build_files/cmake/platform/platform_old_libs_update.cmake @@ -44,3 +44,17 @@ if(UNIX AND DEFINED NANOVDB_INCLUDE_DIR) unset_cache_variables("^NANOVDB") endif() endif() + +# Shared libraries. +if(UNIX AND + DEFINED TBB_LIBRARY AND + TBB_LIBRARY MATCHES "libtbb.a$" AND + EXISTS ${LIBDIR}/usd/lib/python) + message(STATUS "Auto updating CMake configuration for Blender 3.4 libraries") + unset_cache_variables("^BLOSC") + unset_cache_variables("^BOOST") + unset_cache_variables("^OPENSUBDIV") + unset_cache_variables("^OPENVDB") + unset_cache_variables("^TBB") + unset_cache_variables("^USD") +endif() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs