Merge pull request #100 from centricular/fix-find_program

meson: Don't call find_program objects with python
macos/v1.5.9
Emmanuele Bassi 8 years ago committed by GitHub
commit 5c4a907687
  1. 4
      include/epoxy/meson.build
  2. 5
      meson.build
  3. 4
      src/meson.build

@ -6,7 +6,6 @@ gl_generated = custom_target('gl_generated.h',
'gl_generated.h',
],
command: [
python,
gen_dispatch_py,
'--header',
'--no-source',
@ -26,7 +25,6 @@ if build_egl
'egl_generated.h',
],
command: [
python,
gen_dispatch_py,
'--header',
'--no-source',
@ -46,7 +44,6 @@ if build_glx
'glx_generated.h',
],
command: [
python,
gen_dispatch_py,
'--header',
'--no-source',
@ -66,7 +63,6 @@ if build_wgl
'wgl_generated.h',
],
command: [
python,
gen_dispatch_py,
'--header',
'--no-source',

@ -174,11 +174,6 @@ configure_file(input: 'epoxy.pc.in',
install: true,
install_dir: join_paths(epoxy_libdir, 'pkgconfig'))
# Find Python for gen_dispatch
# XXX: With Meson 0.37 we should use
# python = import('python3').find_python()
python = find_program('python3')
# Generates the dispatch tables
gen_dispatch_py = find_program('src/gen_dispatch.py')

@ -12,7 +12,6 @@ gl_generated = custom_target('gl_generated_dispatch.c',
'gl_generated_dispatch.c',
],
command: [
python,
gen_dispatch_py,
'--source',
'--no-header',
@ -30,7 +29,6 @@ if build_egl
'egl_generated_dispatch.c',
],
command: [
python,
gen_dispatch_py,
'--source',
'--no-header',
@ -48,7 +46,6 @@ if build_glx
'glx_generated_dispatch.c',
],
command: [
python,
gen_dispatch_py,
'--source',
'--no-header',
@ -66,7 +63,6 @@ if build_wgl
'wgl_generated_dispatch.c',
],
command: [
python,
gen_dispatch_py,
'--source',
'--no-header',

Loading…
Cancel
Save