From 32b6f82fb55b7f9ce1cd8a9e2e8ebdc3a7ac746c Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Dec 2022 09:27:33 +0200 Subject: py: fix dependency to kms++util Py bindings always calls init_pykmsutils() even if kms++util is not enabled. Fix this. Fixes #68 Signed-off-by: Tomi Valkeinen --- meson.build | 4 ++++ py/pykms/pykms.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/meson.build b/meson.build index ce73f4c..6fffc20 100644 --- a/meson.build +++ b/meson.build @@ -40,6 +40,10 @@ if libdrmomap_dep.found() add_global_arguments('-DHAS_LIBDRM_OMAP', language : 'cpp') endif +if get_option('libutils') + add_global_arguments('-DHAS_KMSXXUTIL', language : 'cpp') +endif + subdir('kms++') if get_option('v4l2').enabled() diff --git a/py/pykms/pykms.cpp b/py/pykms/pykms.cpp index 60ff421..0c17c4c 100644 --- a/py/pykms/pykms.cpp +++ b/py/pykms/pykms.cpp @@ -8,7 +8,10 @@ using namespace kms; using namespace std; void init_pykmsbase(py::module& m); + +#if HAS_KMSXXUTIL void init_pykmsutils(py::module& m); +#endif #if HAS_LIBDRM_OMAP void init_pykmsomap(py::module& m); @@ -18,7 +21,9 @@ PYBIND11_MODULE(pykms, m) { init_pykmsbase(m); +#if HAS_KMSXXUTIL init_pykmsutils(m); +#endif #if HAS_LIBDRM_OMAP init_pykmsomap(m); -- cgit v1.2.3