diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/plugins/dbusservice/meson.build | 4 | ||||
| -rw-r--r-- | src/plugins/opensubtitles/meson.build | 4 | ||||
| -rw-r--r-- | src/plugins/pythonconsole/meson.build | 4 | ||||
| -rw-r--r-- | src/plugins/samplepython/meson.build | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/meson.build b/meson.build index aa403762a..cea363593 100644 --- a/meson.build +++ b/meson.build @@ -192,7 +192,7 @@ if python_option != 'no' pygobject_dep = dependency('pygobject-3.0', version: '>= 2.90.3', required: false) pylint = find_program('pylint-3', 'pylint3', 'pylint', required: false) - if python_version.version_compare(python_req_version) and pygobject_dep.found() and pylint.found() + if python_version.version_compare(python_req_version) and pygobject_dep.found() have_python = true python_deps += pygobject_dep meson.add_install_script('meson_compile_python.py') @@ -200,7 +200,7 @@ if python_option != 'no' endif if not have_python - str = 'python ' + python_req_version + ', pygobject or pylint not found' + str = 'python ' + python_req_version + ', pygobject not found' if python_option == 'yes' error(str) endif diff --git a/src/plugins/dbusservice/meson.build b/src/plugins/dbusservice/meson.build index 3998234fa..ce0d6cbbe 100644 --- a/src/plugins/dbusservice/meson.build +++ b/src/plugins/dbusservice/meson.build @@ -18,4 +18,6 @@ custom_target( install_dir: plugin_dir ) -test('pylint-' + plugin_name, pylint, args: pylint_flags + [ plugin_name + '.py' ]) +if pylint.found() + test('pylint-' + plugin_name, pylint, args: pylint_flags + files([ plugin_name + '.py' ])) +endif diff --git a/src/plugins/opensubtitles/meson.build b/src/plugins/opensubtitles/meson.build index 7beab4dfb..e258adde8 100644 --- a/src/plugins/opensubtitles/meson.build +++ b/src/plugins/opensubtitles/meson.build @@ -39,4 +39,6 @@ install_data( install_dir: join_paths(totem_datadir, 'GConf', 'gsettings') ) -test('pylint-' + plugin_name, pylint, args: pylint_flags + [ plugin_name + '.py', 'hash.py' ]) +if pylint.found() + test('pylint-' + plugin_name, pylint, args: pylint_flags + files([ plugin_name + '.py', 'hash.py' ])) +endif diff --git a/src/plugins/pythonconsole/meson.build b/src/plugins/pythonconsole/meson.build index 768cb0c78..443b1118f 100644 --- a/src/plugins/pythonconsole/meson.build +++ b/src/plugins/pythonconsole/meson.build @@ -38,4 +38,6 @@ install_data( install_dir: join_paths(totem_datadir, 'GConf', 'gsettings') ) -test('pylint-' + plugin_name, pylint, args: pylint_flags + [ plugin_name + '.py', 'console.py' ]) +if pylint.found() + test('pylint-' + plugin_name, pylint, args: pylint_flags + files([ plugin_name + '.py', 'console.py' ])) +endif diff --git a/src/plugins/samplepython/meson.build b/src/plugins/samplepython/meson.build index bfcc06075..e89e038fb 100644 --- a/src/plugins/samplepython/meson.build +++ b/src/plugins/samplepython/meson.build @@ -22,4 +22,6 @@ custom_target( install_dir: plugin_dir ) -test('pylint-' + plugin_name, pylint, args: pylint_flags + [ plugin_name + '.py' ]) +if pylint.found() + test('pylint-' + plugin_name, pylint, args: pylint_flags + files([ plugin_name + '.py' ])) +endif |