mirror of
https://github.com/systemd/systemd.git
synced 2025-03-11 20:58:27 +03:00
meson: invert version check condition to magically suppress warning
Then, it works with --fatal-meson-warnings.
This commit is contained in:
parent
5506aff98d
commit
ff697bb909
@ -474,7 +474,12 @@ if install_tests
|
||||
foreach subdir : testdata_subdirs
|
||||
# install_subdir() before meson 1.3.0 does not handle symlinks correctly (it follows them
|
||||
# instead of copying the symlink) so we use rsync instead.
|
||||
if meson.version().version_compare('<1.3.0')
|
||||
if meson.version().version_compare('>=1.3.0')
|
||||
install_subdir(subdir,
|
||||
exclude_files : ['.gitattributes'],
|
||||
install_dir : testdata_dir,
|
||||
follow_symlinks : false)
|
||||
else
|
||||
if not rsync.found()
|
||||
error('rsync is required to install the integration test data')
|
||||
endif
|
||||
@ -482,11 +487,6 @@ if install_tests
|
||||
rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes -- "@0@" "${DESTDIR:-}@1@"'
|
||||
meson.add_install_script(sh, '-c',
|
||||
rsync_r.format(meson.current_source_dir() / subdir, testdata_dir))
|
||||
else
|
||||
install_subdir(subdir,
|
||||
exclude_files : ['.gitattributes'],
|
||||
install_dir : testdata_dir,
|
||||
follow_symlinks : false)
|
||||
endif
|
||||
endforeach
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user