diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2017-02-08 12:57:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-08 12:57:47 +0000 |
commit | 5c4a907687991596c9983a69f43365c3c182bfc3 (patch) | |
tree | 7e21c14e192782851d6c13e736b320c6d063372f | |
parent | 96286708a4d7ebb6d5b06042d9f9aa5ed6a61fbf (diff) | |
parent | d82bedc2273cdd885c7d8d6d4d9b0b0b72278f9c (diff) | |
download | libepoxy-5c4a907687991596c9983a69f43365c3c182bfc3.tar.gz |
Merge pull request #100 from centricular/fix-find_program
meson: Don't call find_program objects with python
-rw-r--r-- | include/epoxy/meson.build | 4 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | src/meson.build | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/include/epoxy/meson.build b/include/epoxy/meson.build index 809b92c..bf13e9e 100644 --- a/include/epoxy/meson.build +++ b/include/epoxy/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', diff --git a/meson.build b/meson.build index 47f1d45..3048b8f 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/src/meson.build b/src/meson.build index fced355..596dbe5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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', |