Updated with upstream update
This commit is contained in:
14
meson.build
14
meson.build
@ -413,7 +413,7 @@ endif
|
||||
conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir)
|
||||
|
||||
pango_minver = '1.50.0'
|
||||
pangocairo = dependency('pango', version: '>='+pango_minver)
|
||||
pango = dependency('pango', version: '>='+pango_minver)
|
||||
pangocairo = dependency('pangocairo', version: '>='+pango_minver)
|
||||
pangoft2 = dependency('pangoft2', version: '>='+pango_minver)
|
||||
rsvg_minver = '2.40.6'
|
||||
@ -1142,13 +1142,16 @@ endif
|
||||
|
||||
## Lua
|
||||
|
||||
lua = find_program('luajit', required: get_option('lua'))
|
||||
# At time of writing, lua-lgi works Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT2. On
|
||||
# most platforms, we use luajit. On MSYS2, only lua5.1 works with lua-lgi. This
|
||||
# is why we use this order for lua detection.
|
||||
lua = find_program('luajit', 'lua5.1', 'lua5.2', 'lua5.3', required: get_option('lua'))
|
||||
have_lua = get_option('lua').enabled() or (lua.found() and get_option('lua').auto())
|
||||
if not lua.found() and have_lua
|
||||
lua_warning = '''
|
||||
Luajit was not found.
|
||||
Neither Luajit nor Lua was found.
|
||||
Lua plug-ins will be installed anyway but you should make sure that
|
||||
luajit and LGI are available at installation, otherwise
|
||||
luajit or lua and that LGI are available at installation, otherwise
|
||||
installed plug-ins won't be usable.
|
||||
'''
|
||||
warning(lua_warning)
|
||||
@ -1751,12 +1754,13 @@ custom_target('AUTHORS',
|
||||
],
|
||||
build_by_default: false,
|
||||
)
|
||||
date = run_command('date', '-u', '+"%Y-%m-%dT%H:%M:%SZ"', check: true)
|
||||
custom_target('authors.md',
|
||||
input : [ 'authors4pika-web.xsl', 'authors.xml', ],
|
||||
output: 'authors.md',
|
||||
command: [
|
||||
xsltproc,
|
||||
'--stringparam', 'today', '`date --iso-8601=seconds`',
|
||||
'--stringparam', 'today', date.stdout().strip(),
|
||||
'-o', '@OUTPUT@',
|
||||
'@INPUT@',
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user