diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-14 07:09:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-14 11:56:55 +0300 |
commit | 07c6a57507e81fe68a7fb3ee23c951fc80f3a042 (patch) | |
tree | dbe0b7ad4afeb3c67a04f814a985425cdb6c074b /build_files/build_environment/cmake/check_software.cmake | |
parent | 0bc281a6dd12308f17b3d41bdc4cc1104a3e6f18 (diff) |
cmake/deps: Update mesa to 20.3.4
This resolves build error with Py3.9x, use meson build system
since autoconf/automake are no longer supported.
This adds ninja & meson as dependencies for Linux.
Reviewed By: brecht, sybren
Ref D10282
Diffstat (limited to 'build_files/build_environment/cmake/check_software.cmake')
-rw-r--r-- | build_files/build_environment/cmake/check_software.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake index 50b98ac447c..b942e32c8b7 100644 --- a/build_files/build_environment/cmake/check_software.cmake +++ b/build_files/build_environment/cmake/check_software.cmake @@ -33,6 +33,16 @@ if(UNIX) yasm ) + if(NOT APPLE) + set(_required_software + ${_required_software} + + # Needed for Mesa. + meson + ninja + ) + endif() + foreach(_software ${_required_software}) find_program(_software_find NAMES ${_software}) if(NOT _software_find) @@ -60,7 +70,7 @@ if(UNIX) " ${_software_missing}\n" "\n" "On Debian and Ubuntu:\n" - " apt install autoconf automake libtool yasm tcl\n" + " apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n" "\n" "On macOS (with homebrew):\n" " brew install autoconf automake bison libtool pkg-config yasm\n" |