Skip to content

Commit 57332b0

Browse files
committed
meson: Stop using deprecated way getting path of files
Author: Reviewed-by: Discussion: https://postgr.es/m/ Backpatch:
1 parent d3098ce commit 57332b0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

meson.build

+6-2
Original file line numberDiff line numberDiff line change
@@ -2961,8 +2961,12 @@ potentially_conflicting_files = []
29612961
foreach t : potentially_conflicting_files_t
29622962
potentially_conflicting_files += t.full_path()
29632963
endforeach
2964-
foreach t : configure_files
2965-
t = '@0@'.format(t)
2964+
foreach t1 : configure_files
2965+
if meson.version().version_compare('>=0.59')
2966+
t = fs.parent(t1) / fs.name(t1)
2967+
else
2968+
t = '@0@'.format(t1)
2969+
endif
29662970
potentially_conflicting_files += meson.current_build_dir() / t
29672971
endforeach
29682972
foreach sub, fnames : generated_sources_ac

0 commit comments

Comments
 (0)