diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-09-16 13:44:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-09-17 12:02:27 +0300 |
| commit | 157cd6c6e89cfa65b54537b5df101a5184b84298 (patch) | |
| tree | 8833cbd989ec7919ffd3958896a9bc19eda769ed /build_files/build_environment/cmake/ffmpeg.cmake | |
| parent | d377b1fe762c24ee74805ea8c1f666f121399698 (diff) | |
Make deps: Compile own nasm for Linux
This solves annoyance that the official RPM repository of nasm requires
newer version of rpm tool compared to what is shipped by default with
centOS 7.
Differential Revision: https://developer.blender.org/D8905
Diffstat (limited to 'build_files/build_environment/cmake/ffmpeg.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/ffmpeg.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake index 7fbd613b25d..ddfdbc86dac 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -52,6 +52,11 @@ if(APPLE) --target-os=darwin --x86asmexe=${LIBDIR}/nasm/bin/nasm ) +elseif(UNIX) + set(FFMPEG_EXTRA_FLAGS + ${FFMPEG_EXTRA_FLAGS} + --x86asmexe=${LIBDIR}/nasm/bin/nasm + ) endif() ExternalProject_Add(external_ffmpeg @@ -142,7 +147,7 @@ if(WIN32) external_zlib_mingw ) endif() -if(APPLE) +if(UNIX) add_dependencies( external_ffmpeg external_nasm |