Commit 5c7ff376 authored by Marcus Lundblad's avatar Marcus Lundblad
Browse files

meson: Call find_program() once for GJS

Avoiding multiple calls to find_program()
for the generated test scripts.
parent 3d8f4d06
Pipeline #281265 passed with stages
in 14 minutes and 25 seconds
...@@ -49,6 +49,8 @@ top_inc = include_directories('.') ...@@ -49,6 +49,8 @@ top_inc = include_directories('.')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
gjs = find_program('gjs')
subdir('po') subdir('po')
subdir('src') subdir('src')
subdir('lib') subdir('lib')
......
script_conf = configuration_data() script_conf = configuration_data()
script_conf.set('GJS', find_program('gjs').path()) script_conf.set('GJS', gjs.path())
script_conf.set('PACKAGE_VERSION', version) script_conf.set('PACKAGE_VERSION', version)
script_conf.set('libdir', libdir) script_conf.set('libdir', libdir)
script_conf.set('prefix', prefix) script_conf.set('prefix', prefix)
......
...@@ -4,7 +4,7 @@ tests = ['addressTest', 'boundingBoxTest', 'colorTest', 'osmNamesTest', ...@@ -4,7 +4,7 @@ tests = ['addressTest', 'boundingBoxTest', 'colorTest', 'osmNamesTest',
foreach test : tests foreach test : tests
script_conf = configuration_data() script_conf = configuration_data()
script_conf.set('GJS', find_program('gjs').path()) script_conf.set('GJS', gjs.path())
script_conf.set('PACKAGE_VERSION', version) script_conf.set('PACKAGE_VERSION', version)
script_conf.set('libdir', libdir) script_conf.set('libdir', libdir)
script_conf.set('prefix', prefix) script_conf.set('prefix', prefix)
...@@ -19,7 +19,7 @@ foreach test : tests ...@@ -19,7 +19,7 @@ foreach test : tests
endforeach endforeach
foreach test : tests foreach test : tests
test(test, find_program('gjs'), test(test, gjs,
args: ['-I', meson.source_root() + '/src/', '-I', args: ['-I', meson.source_root() + '/src/', '-I',
meson.source_root() + '/tests/', meson.source_root() + '/tests/',
'tests/@0@'.format(test)], 'tests/@0@'.format(test)],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment