[Bf-blender-cvs] [ef35247ee1e] master: Fix make deps harvest error on Linux, due to macOS specific folder in Vulkan

Brecht Van Lommel noreply at git.blender.org
Thu Dec 15 19:20:03 CET 2022


Commit: ef35247ee1e16bab802cc5ee2a06ae1ea2b159a1
Author: Brecht Van Lommel
Date:   Thu Dec 15 19:17:36 2022 +0100
Branches: master
https://developer.blender.org/rBef35247ee1e16bab802cc5ee2a06ae1ea2b159a1

Fix make deps harvest error on Linux, due to macOS specific folder in Vulkan

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

M	build_files/build_environment/cmake/harvest.cmake

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

diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 60d633c0ca9..252e52361c5 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -271,7 +271,9 @@ harvest(zstd/lib zstd/lib "*.a")
 harvest(shaderc shaderc "*")
 harvest(vulkan_headers vulkan "*")
 harvest_rpath_lib(vulkan_loader/lib vulkan/lib "*${SHAREDLIBEXT}*")
-harvest(vulkan_loader/loader vulkan/loader "*")
+if(APPLE)
+  harvest(vulkan_loader/loader vulkan/loader "*")
+endif()
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*${SHAREDLIBEXT}*")



More information about the Bf-blender-cvs mailing list