From 177759d8182f64c9aa3680e70b7ef0e27c4c387f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastia=CC=81n=20Barschkis?= <sebbas@sebbas.org>
Date: Fri, 11 Sep 2020 14:55:48 +0200
Subject: Make deps: Updated required list of dependencies for macOS

It was possible to drop `nasm` from the list of required macOS dependencies. However, `pkg-config` had to be added - it was required before but probably no one noticed this.

In order to build `external_clang` successfully, `external_xml2` had to be added to the clang dependencies (`c-index-test` was failing).

Note: On Linux `make deps` still seems to require `nasm` installed via apt.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D8870
---
 build_files/build_environment/CMakeLists.txt             | 2 +-
 build_files/build_environment/cmake/check_software.cmake | 8 ++++----
 build_files/build_environment/cmake/clang.cmake          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'build_files')

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 6415d270773..d521abc418f 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -30,7 +30,7 @@
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # MAC OS X USAGE:
-#   Install with homebrew: brew install cmake autoconf automake libtool yasm nasm bison
+#   Install with homebrew: brew install autoconf automake bison cmake libtool pkg-config yasm
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake
index 384915aba84..2530b0b3251 100644
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -26,11 +26,11 @@ if(UNIX)
   set(_required_software
     autoconf
     automake
+    bison
     ${_libtoolize_name}
-    nasm
-    yasm
+    pkg-config
     tclsh
-    bison
+    yasm
   )
 
   foreach(_software ${_required_software})
@@ -57,7 +57,7 @@ if(UNIX)
       "  apt install autoconf automake libtool yasm nasm tcl\n"
       "\n"
       "On macOS (with homebrew):\n"
-      "  brew install cmake autoconf automake libtool yasm nasm bison\n"
+      "  brew install autoconf automake bison libtool pkg-config yasm\n"
       "\n"
       "Other platforms:\n"
       "  Install equivalent packages.\n")
diff --git a/build_files/build_environment/cmake/clang.cmake b/build_files/build_environment/cmake/clang.cmake
index 8b928f968fd..b402446d873 100644
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -62,5 +62,6 @@ endif()
 
 add_dependencies(
   external_clang
+  external_xml2
   ll
 )
-- 
cgit v1.2.3