[Bf-blender-cvs] [982fb66fb13] master: Build: ensure meson is built before use

[Campbell Barton]

Commit: 982fb66fb133bbae2d9a80c086b131f4ffdb879f
Author: Campbell Barton
Date:   Tue Dec 13 11:12:39 2022 +1100
Branches: master
https://developer.blender.org/rB982fb66fb133bbae2d9a80c086b131f4ffdb879f

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.

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

M	build_files/build_environment/cmake/check_software.cmake
M	build_files/build_environment/cmake/epoxy.cmake
M	build_files/build_environment/cmake/fribidi.cmake
M	build_files/build_environment/cmake/harfbuzz.cmake
M	build_files/build_environment/cmake/mesa.cmake
M	build_files/build_environment/cmake/wayland.cmake
M	build_files/build_environment/cmake/wayland_protocols.cmake

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

diff --git a/build_files/build_environment/cmake/check_software.cmake b/build_files/build_environment/cmake/check_software.cmake
index 34544ca176b..93ea3ff071d 100644
--- a/build_files/build_environment/cmake/check_software.cmake
+++ b/build_files/build_environment/cmake/check_software.cmake
@@ -12,7 +12,6 @@ if(UNIX)
     automake
     bison
     ${_libtoolize_name}
-    meson
     ninja
     pkg-config
     tclsh
diff --git a/build_files/build_environment/cmake/epoxy.cmake b/build_files/build_environment/cmake/epoxy.cmake
index 312784598d4..da9c204d5ec 100644
--- a/build_files/build_environment/cmake/epoxy.cmake
+++ b/build_files/build_environment/cmake/epoxy.cmake
@@ -26,5 +26,6 @@ endif()
 
 add_dependencies(
   external_epoxy
+  # Needed for `MESON`.
   external_python_site_packages
 )
diff --git a/build_files/build_environment/cmake/fribidi.cmake b/build_files/build_environment/cmake/fribidi.cmake
index 6e063eb5b26..9d83191741f 100644
--- a/build_files/build_environment/cmake/fribidi.cmake
+++ b/build_files/build_environment/cmake/fribidi.cmake
@@ -18,6 +18,7 @@ ExternalProject_Add(external_fribidi
 add_dependencies(
   external_fribidi
   external_python
+  # Needed for `MESON`.
   external_python_site_packages
 )
 
diff --git a/build_files/build_environment/cmake/harfbuzz.cmake b/build_files/build_environment/cmake/harfbuzz.cmake
index 619ed66f603..d889e7e6cb4 100644
--- a/build_files/build_environment/cmake/harfbuzz.cmake
+++ b/build_files/build_environment/cmake/harfbuzz.cmake
@@ -30,6 +30,7 @@ ExternalProject_Add(external_harfbuzz
 add_dependencies(
   external_harfbuzz
   external_python
+  # Needed for `MESON`.
   external_python_site_packages
 )
 
diff --git a/build_files/build_environment/cmake/mesa.cmake b/build_files/build_environment/cmake/mesa.cmake
index 63b17189e10..8c7ec8fac07 100644
--- a/build_files/build_environment/cmake/mesa.cmake
+++ b/build_files/build_environment/cmake/mesa.cmake
@@ -53,4 +53,6 @@ add_dependencies(
   external_mesa
   ll
   external_zlib
+  # Needed for `MESON`.
+  external_python_site_packages
 )
diff --git a/build_files/build_environment/cmake/wayland.cmake b/build_files/build_environment/cmake/wayland.cmake
index 279ca6a787c..76fbbcf3f97 100644
--- a/build_files/build_environment/cmake/wayland.cmake
+++ b/build_files/build_environment/cmake/wayland.cmake
@@ -24,4 +24,7 @@ add_dependencies(
   external_expat
   external_xml2
   external_ffi
+
+  # Needed for `MESON`.
+  external_python_site_packages
 )
diff --git a/build_files/build_environment/cmake/wayland_protocols.cmake b/build_files/build_environment/cmake/wayland_protocols.cmake
index 6d5ff3eb89e..708d9adba1e 100644
--- a/build_files/build_environment/cmake/wayland_protocols.cmake
+++ b/build_files/build_environment/cmake/wayland_protocols.cmake
@@ -15,4 +15,6 @@ ExternalProject_Add(external_wayland_protocols
 add_dependencies(
   external_wayland_protocols
   external_wayland
+  # Needed for `MESON`.
+  external_python_site_packages
 )