Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
linphone-cmake-builder
Commits
9a48cc80
Commit
9a48cc80
authored
Aug 02, 2016
by
Gautier Pelloux-Prayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prepare.py: fix error
parent
9732846b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
prepare.py
prepare.py
+3
-3
No files found.
prepare.py
View file @
9a48cc80
...
...
@@ -245,7 +245,7 @@ class Preparator:
self
.
missing_python_dependencies
+=
[
modname
]
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
warn
:
self
.
missing_dependencies
[
binary
]
=
prog
...
...
@@ -273,7 +273,7 @@ class Preparator:
error
(
"Invalid location: path should not contain any spaces."
)
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
:
ret
|=
not
self
.
check_cmake_version
()
...
...
@@ -479,7 +479,7 @@ class Preparator:
return
ret
# Only generated makefile if we are using Ninja or Makefile
if
self
.
generator
().
endswith
(
'Ninja'
):
if
not
self
.
check_is_installed
(
"ninja"
,
"
it
"
):
if
not
self
.
check_is_installed
(
"ninja"
,
"
ninja
"
):
return
1
self
.
generate_makefile
(
'ninja -C'
)
info
(
"You can now run 'make' to build."
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment