[gegl/abderrahim/meson-python-fix: 2/2] meson: use python installation found by meson



commit 648c76b8d500cb99ff952d09d71badfcd9e678fc
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Aug 16 09:31:26 2019 +0100

    meson: use python installation found by meson
    
    This is more robust than looking for "python" in the PATH, as /usr/bin/python
    might not exist when only python3 is available.

 opencl/meson.build             | 2 +-
 tests/compositions/meson.build | 3 ++-
 tests/python/meson.build       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/opencl/meson.build b/opencl/meson.build
index 6c5bee0a2..e00b860d4 100644
--- a/opencl/meson.build
+++ b/opencl/meson.build
@@ -56,6 +56,6 @@ foreach source : opencl_sources
   opencl_headers += custom_target(source + '.h',
     input : source,
     output: source +'.h',
-    command: [ cltostring, '@INPUT@', '@OUTPUT@' ],
+    command: [ python, cltostring, '@INPUT@', '@OUTPUT@' ],
   )
 endforeach
diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
index 268eda4ec..446a3e5c6 100644
--- a/tests/compositions/meson.build
+++ b/tests/compositions/meson.build
@@ -73,8 +73,9 @@ run_compositions = find_program('run-compositions.py')
 
 if false
 test('compositions_with_opencl',
-  run_compositions,
+  python,
   args: [
+    run_compositions.path(),
     '--build-dir='+ meson.build_root(),
     '--src-dir='  + meson.source_root(),
     '--xml-dir='  + meson.current_source_dir(),
diff --git a/tests/python/meson.build b/tests/python/meson.build
index f0f9c5868..310e48f42 100644
--- a/tests/python/meson.build
+++ b/tests/python/meson.build
@@ -11,7 +11,8 @@ if python.found() and pygobject_found
   foreach testname : testnames
     testfile = 'test-' + testname + '.py'
     test(testname,
-      find_program(testfile),
+      python,
+      args: [ find_program(testfile).path() ],
       env: [
         'LD_LIBRARY_PATH=' + meson.build_root() / 'gegl' + ':$LD_LIBRARY_PATH',
         'GI_TYPELIB_PATH=' + meson.build_root() / 'gegl' + ':$GI_TYPELIB_PATH',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]