diff options
| author | Michael <michaelbrockus@gmail.com> | 2020-04-18 21:28:26 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-20 19:31:21 +0300 |
| commit | e04b0ae6b6220381b4aa493289960a3555201717 (patch) | |
| tree | dd12aa5835384ca8b3f0f4adc1fbb7e687641b1a /mesonbuild | |
| parent | dc19b132024f818bfbd3e140e8141cbcabb3d720 (diff) | |
| download | meson-e04b0ae6b6220381b4aa493289960a3555201717.zip meson-e04b0ae6b6220381b4aa493289960a3555201717.tar.gz meson-e04b0ae6b6220381b4aa493289960a3555201717.tar.bz2 | |
fix ninja version inconsistent
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 03ccd19..3f0cfca 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -294,7 +294,7 @@ int dummy; def generate(self): ninja = environment.detect_ninja_command_and_version(log=True) if ninja is None: - raise MesonException('Could not detect Ninja v1.5 or newer') + raise MesonException('Could not detect Ninja v1.7 or newer') (self.ninja_command, self.ninja_version) = ninja outfilename = os.path.join(self.environment.get_build_dir(), self.ninja_filename) tempfilename = outfilename + '~' @@ -303,7 +303,7 @@ int dummy; 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.5.1\n\n') + outfile.write('ninja_required_version = 1.7.1\n\n') num_pools = self.environment.coredata.backend_options['backend_max_links'].value if num_pools > 0: |