diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-07-07 11:47:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-07-07 17:26:13 +0300 |
| commit | 1e3c0b4b03e1b1f6a2a66539e7648a5b92fada91 (patch) | |
| tree | d46d93355f0bda55834b9e0fa419300e51ab92e0 /build_files/build_environment/cmake/x264.cmake | |
| parent | 202e7ccaaee8909f72465f67ab59626fa6dd3a48 (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/cmake/x264.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/x264.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index 8bcb5a2938f..62a46254a99 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -39,3 +39,10 @@ ExternalProject_Add(external_x264 if(MSVC) set_target_properties(external_x264 PROPERTIES FOLDER Mingw) endif() + +if(APPLE) + add_dependencies( + external_x264 + external_nasm + ) +endif() |