erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-08 16:47:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

chore(common): Work with older meson versions

Browse source 
The copy keyword inside of configure_file got added in meson 0.47.
However, we still support Bionic which comes with meson 0.45. This
change adds a workaround.
This commit is contained in:
Eberhard Beilharz 2021-10-28 11:36:09 +02:00
parent 4c5824fc6a
commit 614ba114ef
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/core/desktop/tests/unit/kmx/meson.build
View file

@ -78,6 +78,7 @@ tests = [
if build_machine.system() == 'windows'
kmcomp = find_program('kmcomp.exe', required: false)
kmcomp_cmd = [kmcomp]
copy_cmd = [find_program('cmd.exe', required: true), '/c', 'copy']
else
kmcomp = find_program('kmcomp', required: false)
kmcomp_cmd = [kmcomp]
@ -89,6 +90,7 @@ else
kmcomp = disabler()
endif
endif
copy_cmd = [find_program('cp', required: true)]
endif
if compiler.get_id() == 'emscripten'
@ -115,13 +117,13 @@ foreach kbd : tests
]
}'''
configure_file(
copy: true,
command: copy_cmd + ['@INPUT@', '@OUTPUT@'],
input: kbd + '.kmn',
output: kbd + '.kmn'
)
if not kmcomp.found()
configure_file(
copy: true,
command: copy_cmd + ['@INPUT@', '@OUTPUT@'],
input: kbd + '.kmx',
output: kbd + '.kmx'
)