blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Build: ensure meson is built before use 

Meson is built as part of external_python_site_packages,
without this dependency it would be called before being built.

Also remove Meson as a build requirement since the version is used.
This commit is contained in:
Campbell Barton 2022-12-13 11:12:39 +11:00
parent 17a20ed7fe
commit 982fb66fb1
7 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/build_environment/cmake/check_software.cmake
View File

@ -12,7 +12,6 @@ if(UNIX)
automake
bison
${_libtoolize_name}
meson
ninja
pkg-config
tclsh

1
build_files/build_environment/cmake/epoxy.cmake
View File

@ -26,5 +26,6 @@ endif()
add_dependencies(
external_epoxy
# Needed for `MESON`.
external_python_site_packages
)

1
build_files/build_environment/cmake/fribidi.cmake
View File

@ -18,6 +18,7 @@ ExternalProject_Add(external_fribidi
add_dependencies(
external_fribidi
external_python
# Needed for `MESON`.
external_python_site_packages
)

1
build_files/build_environment/cmake/harfbuzz.cmake
View File

@ -30,6 +30,7 @@ ExternalProject_Add(external_harfbuzz
add_dependencies(
external_harfbuzz
external_python
# Needed for `MESON`.
external_python_site_packages
)

2
build_files/build_environment/cmake/mesa.cmake
View File

@ -53,4 +53,6 @@ add_dependencies(
external_mesa
ll
external_zlib
# Needed for `MESON`.
external_python_site_packages
)

3
build_files/build_environment/cmake/wayland.cmake
View File

@ -24,4 +24,7 @@ add_dependencies(
external_expat
external_xml2
external_ffi
# Needed for `MESON`.
external_python_site_packages
)

2
build_files/build_environment/cmake/wayland_protocols.cmake
View File

@ -15,4 +15,6 @@ ExternalProject_Add(external_wayland_protocols
add_dependencies(
external_wayland_protocols
external_wayland
# Needed for `MESON`.
external_python_site_packages
)