Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-07-07 11:47:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-07-07 17:26:13 +0300
commit1e3c0b4b03e1b1f6a2a66539e7648a5b92fada91 (patch)
treed46d93355f0bda55834b9e0fa419300e51ab92e0 /build_files/build_environment/CMakeLists.txt
parent202e7ccaaee8909f72465f67ab59626fa6dd3a48 (diff)
Make deps: Compile own version of nasm for Apple
The upstream version of nasm does not put version information to the generated object files, which makes linker to show the following warning: building for macOS, but linking in object file Using own patched version of nasm which puts required information to the object file, making linker happy. The plan is to either streamline the patch and provide it to the upstream, or, it that takes too long, get an independent fix from the upstream.
Diffstat (limited to 'build_files/build_environment/CMakeLists.txt')
-rw-r--r--build_files/build_environment/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 876372ca8c4..7e7c5d58d71 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -76,6 +76,7 @@ include(cmake/llvm.cmake)
include(cmake/clang.cmake)
if(APPLE)
include(cmake/openmp.cmake)
+ include(cmake/nasm.cmake)
endif()
include(cmake/openimageio.cmake)
include(cmake/tiff.cmake)