From 157cd6c6e89cfa65b54537b5df101a5184b84298 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Wed, 16 Sep 2020 12:44:17 +0200
Subject: 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
---
 build_files/build_environment/cmake/x264.cmake | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'build_files/build_environment/cmake/x264.cmake')

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
-- 
cgit v1.2.3