mirror of
https://gitlab.com/virt-viewer/virt-viewer.git
synced 2025-01-03 01:17:46 +03:00
build: use full_path() for referencing programs
When using the result of find_program, meson may expand it to include both an interpretor path and the script path. If we then add the interpretor path too, we fail. Using 'full_path()' ensures we get only the script path. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
f7900e4ed8
commit
dec15f96a0
@ -50,7 +50,7 @@ if with_msi
|
||||
output: ['buildenv.txt'],
|
||||
command: [
|
||||
python3,
|
||||
buildenv_prog,
|
||||
buildenv_prog.full_path(),
|
||||
],
|
||||
capture: true)
|
||||
|
||||
@ -93,7 +93,7 @@ if with_msi
|
||||
build_by_default: false,
|
||||
command: [
|
||||
python3,
|
||||
msitool_prog,
|
||||
msitool_prog.full_path(),
|
||||
meson.build_root(),
|
||||
prefix,
|
||||
wixl_arch,
|
||||
|
@ -512,7 +512,7 @@ configure_file(
|
||||
subdir('build-aux')
|
||||
|
||||
if git
|
||||
authors = run_command(python3.full_path(), gen_authors_prog, env: runutf8, check: true)
|
||||
authors = run_command(python3.full_path(), gen_authors_prog.full_path(), env: runutf8, check: true)
|
||||
authors_file = 'AUTHORS.in'
|
||||
|
||||
authors_conf = configuration_data()
|
||||
@ -536,8 +536,8 @@ if git
|
||||
configuration: conf_data
|
||||
)
|
||||
|
||||
meson.add_dist_script(python3.full_path(), dist_prog, meson.project_build_root(), 'AUTHORS')
|
||||
meson.add_dist_script(python3.full_path(), dist_prog, meson.project_build_root(), 'virt-viewer.spec')
|
||||
meson.add_dist_script(python3.full_path(), dist_prog.full_path(), meson.project_build_root(), 'AUTHORS')
|
||||
meson.add_dist_script(python3.full_path(), dist_prog.full_path(), meson.project_build_root(), 'virt-viewer.spec')
|
||||
endif
|
||||
|
||||
gnome = import('gnome')
|
||||
|
@ -187,7 +187,7 @@ if host_machine.system() == 'windows'
|
||||
output: ['virt-viewer-rc.o'],
|
||||
command : [
|
||||
python3,
|
||||
run_windres_prog,
|
||||
run_windres_prog.full_path(),
|
||||
windres,
|
||||
join_paths(meson.build_root(), 'icons'),
|
||||
meson.current_source_dir(),
|
||||
|
Loading…
Reference in New Issue
Block a user