[Bf-blender-cvs] [10271b8bf0d] tmp_lib_update_32: Build: disable level-zero on macOS, not needed and fails to build
Brecht Van Lommel
noreply at git.blender.org
Sun Apr 10 23:47:19 CEST 2022
Commit: 10271b8bf0d36811b9b3354d5e22addd24a5a86a
Author: Brecht Van Lommel
Date: Sun Apr 10 23:46:42 2022 +0200
Branches: tmp_lib_update_32
https://developer.blender.org/rB10271b8bf0d36811b9b3354d5e22addd24a5a86a
Build: disable level-zero on macOS, not needed and fails to build
===================================================================
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/harvest.cmake
===================================================================
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 347605594e6..8f4738d1f1c 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -112,7 +112,9 @@ if(BLENDER_PLATFORM_ARM)
endif()
include(cmake/webp.cmake)
-include(cmake/level-zero.cmake)
+if(NOT APPLE)
+ include(cmake/level-zero.cmake)
+endif()
if(NOT WIN32 OR ENABLE_MINGW64)
include(cmake/gmp.cmake)
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 6611f94ebae..2e23c23998a 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -85,8 +85,10 @@ harvest(jemalloc/lib jemalloc/lib "*.a")
harvest(jpeg/include jpeg/include "*.h")
harvest(jpeg/lib jpeg/lib "libjpeg.a")
harvest(lame/lib ffmpeg/lib "*.a")
-harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
-harvest(level-zero/lib level-zero/lib "*.a")
+if(NOT APPLE)
+ harvest(level-zero/include/level_zero level-zero/include/level_zero "*.h")
+ harvest(level-zero/lib level-zero/lib "*.a")
+endif()
harvest(llvm/bin llvm/bin "clang-format")
if(BUILD_CLANG_TOOLS)
harvest(llvm/bin llvm/bin "clang-tidy")
More information about the Bf-blender-cvs
mailing list