diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-22 03:55:51 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-26 20:28:55 +0200 |
| commit | cef13b04c253150a449eaea806d97207281916eb (patch) | |
| tree | eac707c5f46fd95d39bf09203c88b7318eddc105 /mesonbuild/environment.py | |
| parent | 87b2aeb54cdf0c991f25a00f1d6dacc4aba8de0e (diff) | |
| download | meson-cef13b04c253150a449eaea806d97207281916eb.zip meson-cef13b04c253150a449eaea806d97207281916eb.tar.gz meson-cef13b04c253150a449eaea806d97207281916eb.tar.bz2 | |
Bump Ninja requirement to 1.8.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 7194d03..faac0ed 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -175,11 +175,11 @@ def find_coverage_tools() -> T.Tuple[T.Optional[str], T.Optional[str], T.Optiona 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.2', 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.2', 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']: |