Bump Ninja requirement to 1.8.
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 15218c1..3f65b8f 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -492,7 +492,7 @@
def generate(self):
ninja = environment.detect_ninja_command_and_version(log=True)
if ninja is None:
- raise MesonException('Could not detect Ninja v1.7 or newer')
+ raise MesonException('Could not detect Ninja v1.8 or newer')
(self.ninja_command, self.ninja_version) = ninja
outfilename = os.path.join(self.environment.get_build_dir(), self.ninja_filename)
tempfilename = outfilename + '~'
@@ -500,7 +500,7 @@
outfile.write('# This is the build file for project "{}"\n'.format(self.build.get_project()))
outfile.write('# It is autogenerated by the Meson build system.\n')
outfile.write('# Do not edit by hand.\n\n')
- outfile.write('ninja_required_version = 1.7.1\n\n')
+ outfile.write('ninja_required_version = 1.8.2\n\n')
num_pools = self.environment.coredata.backend_options['backend_max_links'].value
if num_pools > 0:
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 7194d03..4ef3721 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -175,11 +175,11 @@
return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe, llvm_cov_exe
-def detect_ninja(version: str = '1.7', log: bool = False) -> T.List[str]:
+def detect_ninja(version: str = '1.8', log: bool = False) -> T.List[str]:
r = detect_ninja_command_and_version(version, log)
return r[0] if r else None
-def detect_ninja_command_and_version(version: str = '1.7', log: bool = False) -> (T.List[str], str):
+def detect_ninja_command_and_version(version: str = '1.8', log: bool = False) -> (T.List[str], str):
from .dependencies.base import ExternalProgram
env_ninja = os.environ.get('NINJA', None)
for n in [env_ninja] if env_ninja else ['ninja', 'ninja-build', 'samu']:
