diff options
author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
---|---|---|
committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
tree | 0cbb1b91fe26c750197126085b74224a795a103c /build_files/build_environment/cmake/check_software.cmake | |
parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'build_files/build_environment/cmake/check_software.cmake')
-rw-r--r-- | build_files/build_environment/cmake/check_software.cmake | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake index 2a1aaef0bee..cc8fead6f81 100644 --- a/build_files/build_environment/cmake/check_software.cmake +++ b/build_files/build_environment/cmake/check_software.cmake @@ -12,21 +12,13 @@ if(UNIX) automake bison ${_libtoolize_name} + meson + ninja pkg-config tclsh 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) @@ -56,11 +48,8 @@ if(UNIX) "On Debian and Ubuntu:\n" " apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n" "\n" - "On macOS Intel (with homebrew):\n" - " brew install autoconf automake bison libtool pkg-config yasm\n" - "\n" - "On macOS ARM (with homebrew):\n" - " brew install autoconf automake bison flex libtool pkg-config yasm\n" + "On macOS (with homebrew):\n" + " brew install autoconf automake bison flex libtool meson ninja pkg-config yasm\n" "\n" "Other platforms:\n" " Install equivalent packages.\n") |