<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le ven. 10 janv. 2020 08 h 05, <<a href="mailto:madhavan.krishnan@linaro.org">madhavan.krishnan@linaro.org</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Madhavan Krishnan <<a href="mailto:madhavan.krishnan@linaro.org" target="_blank" rel="noreferrer">madhavan.krishnan@linaro.org</a>><br>
<br>
importing python module can provide the exact path<br>
which can be used in desktop build as well as from<br>
any build system<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Are you certain this is the right solution ? There is absolutely no other meson project using this hack to call python script. I notice the shebang isn't pythonic (not using env), could be that. I just don't believe such hack is required. It's definately not in meson style.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
include/libcamera/meson.build | 4 +++-<br>
src/libcamera/meson.build | 4 +++-<br>
2 files changed, 6 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build<br>
index 99abf06..83525e2 100644<br>
--- a/include/libcamera/meson.build<br>
+++ b/include/libcamera/meson.build<br>
@@ -21,13 +21,15 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera')<br>
install_headers(libcamera_api,<br>
subdir : include_dir)<br>
<br>
+python_mod = import('python3').find_python()<br>
+<br>
gen_controls = files('../../src/libcamera/gen-controls.py')<br>
<br>
control_ids_h = custom_target('control_ids_h',<br>
input : files('../../src/libcamera/control_ids.yaml', '<a href="http://control_ids.h.in" rel="noreferrer noreferrer" target="_blank">control_ids.h.in</a>'),<br>
output : 'control_ids.h',<br>
depend_files : gen_controls,<br>
- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],<br>
+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'],<br>
install : true,<br>
install_dir : join_paths('include', include_dir))<br>
<br>
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build<br>
index c4f965b..243935b 100644<br>
--- a/src/libcamera/meson.build<br>
+++ b/src/libcamera/meson.build<br>
@@ -65,13 +65,15 @@ if libudev.found()<br>
])<br>
endif<br>
<br>
+python_mod = import('python3').find_python()<br>
+<br>
gen_controls = files('gen-controls.py')<br>
<br>
control_ids_cpp = custom_target('control_ids_cpp',<br>
input : files('control_ids.yaml', '<a href="http://control_ids.cpp.in" rel="noreferrer noreferrer" target="_blank">control_ids.cpp.in</a>'),<br>
output : 'control_ids.cpp',<br>
depend_files : gen_controls,<br>
- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])<br>
+ command : [python_mod, gen_controls, '-o', '@OUTPUT@', '@INPUT@'])<br>
<br>
libcamera_sources += control_ids_cpp<br>
libcamera_sources += control_ids_h<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
libcamera-devel mailing list<br>
<a href="mailto:libcamera-devel@lists.libcamera.org" target="_blank" rel="noreferrer">libcamera-devel@lists.libcamera.org</a><br>
<a href="https://lists.libcamera.org/listinfo/libcamera-devel" rel="noreferrer noreferrer" target="_blank">https://lists.libcamera.org/listinfo/libcamera-devel</a><br>
</blockquote></div></div></div>