prepare.py: fix error

parent 9732846b
...@@ -245,7 +245,7 @@ class Preparator: ...@@ -245,7 +245,7 @@ class Preparator:
self.missing_python_dependencies += [modname] self.missing_python_dependencies += [modname]
return False return False
def check_is_installed(self, binary, prog=None, warn=True): def check_is_installed(self, binary, prog, warn=True):
if not find_executable(binary): if not find_executable(binary):
if warn: if warn:
self.missing_dependencies[binary] = prog self.missing_dependencies[binary] = prog
...@@ -273,7 +273,7 @@ class Preparator: ...@@ -273,7 +273,7 @@ class Preparator:
error("Invalid location: path should not contain any spaces.") error("Invalid location: path should not contain any spaces.")
ret = 1 ret = 1
ret |= not self.check_is_installed('cmake') ret |= not self.check_is_installed('cmake', 'cmake')
if not ret and self.min_cmake_version is not None: if not ret and self.min_cmake_version is not None:
ret |= not self.check_cmake_version() ret |= not self.check_cmake_version()
...@@ -479,7 +479,7 @@ class Preparator: ...@@ -479,7 +479,7 @@ class Preparator:
return ret return ret
# Only generated makefile if we are using Ninja or Makefile # Only generated makefile if we are using Ninja or Makefile
if self.generator().endswith('Ninja'): if self.generator().endswith('Ninja'):
if not self.check_is_installed("ninja", "it"): if not self.check_is_installed("ninja", "ninja"):
return 1 return 1
self.generate_makefile('ninja -C') self.generate_makefile('ninja -C')
info("You can now run 'make' to build.") info("You can now run 'make' to build.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment