[Bf-blender-cvs] [cc496445518] master: Build: check necessary software is installed for make deps on macOS and Linux

Brecht Van Lommel noreply at git.blender.org
Fri Aug 30 11:22:22 CEST 2019


Commit: cc496445518d752d2a2bdad25d7c48115cacd659
Author: Brecht Van Lommel
Date:   Thu Aug 29 17:46:04 2019 +0200
Branches: master
https://developer.blender.org/rBcc496445518d752d2a2bdad25d7c48115cacd659

Build: check necessary software is installed for make deps on macOS and Linux

To avoid errors deep into the build process. Fixes T69297.

===================================================================

M	build_files/build_environment/CMakeLists.txt
A	build_files/build_environment/cmake/check_software.cmake

===================================================================

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 1b387cb86a2..d904ba27abc 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -43,6 +43,7 @@ project("BlenderDependencies")
 cmake_minimum_required(VERSION 3.5)
 
 include(ExternalProject)
+include(cmake/check_software.cmake)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
 
diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake
new file mode 100644
index 00000000000..30dea754e20
--- /dev/null
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -0,0 +1,53 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(UNIX)
+  set(_required_software
+    autoconf
+    automake
+    libtoolize
+    nasm
+    yasm
+    tclsh
+  )
+
+  foreach(_software ${_required_software})
+    find_program(_software_find NAMES ${_software})
+    if(NOT _software_find)
+      set(_software_missing "${_software_missing}${_software} ")
+    endif()
+    unset(_software_find CACHE)
+  endforeach()
+
+  if(_software_missing)
+    message(
+      "\n"
+      "Missing software for building Blender dependencies:\n"
+      "  ${_software_missing}\n"
+      "\n"
+      "On Debian and Ubuntu:\n"
+      "  apt install autoconf automake libtool yasm nasm tcl\n"
+      "\n"
+      "On macOS (with homebrew):\n"
+      "  brew install cmake autoconf automake libtool yasm nasm\n"
+      "\n"
+      "Other platforms:\n"
+      "  Install equivalent packages.\n")
+    message(FATAL_ERROR "Install missing software before continuing")
+  endif()
+endif()



More information about the Bf-blender-cvs mailing list