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/x264.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/x264.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/x264.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index 993e4591cb7..8daaf57a220 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -34,6 +34,12 @@ else() set(X264_CONFIGURE_ENV echo .) endif() +if(UNIX AND NOT APPLE) + set(X264_CONFIGURE_ENV + export AS=${LIBDIR}/nasm/bin/nasm + ) +endif() + ExternalProject_Add(external_x264 URL ${X264_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} @@ -54,7 +60,7 @@ if(MSVC) set_target_properties(external_x264 PROPERTIES FOLDER Mingw) endif() -if(APPLE) +if(UNIX) add_dependencies( external_x264 external_nasm |