diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-22 03:55:51 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-26 17:12:54 +0200 |
| commit | 0f92bb0cd341495031cbf1d4a175a611cf85caf3 (patch) | |
| tree | 5ea22c5ac4ded336b319c245c32642110743bab6 /mesonbuild/environment.py | |
| parent | 15bbf1ea7581a8a872296435b28d679c7e42a466 (diff) | |
| download | meson-ninjabump.tar.gz | |
Bump Ninja requirement to 1.8.ninjabump
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 7194d0345..faac0edec 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']: |