[planner: 6/40] build: Fix sql and python plugin deps and install sql plugin




commit 49c193d2c1a2769efb21a0332c94ba691be8190e
Author: Mart Raudsepp <leio gentoo org>
Date:   Wed Mar 4 11:35:39 2020 +0200

    build: Fix sql and python plugin deps and install sql plugin
    
    In autotools these somehow worked with some hard to track magic.
    Just include full planner_deps in the dependencies list to get it to
    compile, and we'll handle excessive deps in a later cleanup step.
    Also add missing include directories and installation for it, or it
    fails on config.h include and doesn't get installed at all.

 src/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index d9dd2e30..caf1ddc5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -99,14 +99,17 @@ planner_app = executable('planner',
 if gda_dep.found()
   libsql_plugin_srcs = [ 'planner-sql-plugin.c' ]
   libsql_plugin_module = shared_module('sql-plugin', [libsql_plugin_srcs],
-    dependencies: [gda_dep],
+    dependencies: [planner_deps, gda_dep],
+    include_directories: [toplevel_inc],
+    install: true,
+    install_dir: join_paths(get_option('libdir'), 'planner/plugins'),
   )
 endif
 
 if pygtk_dep.found() and python_dep.found()
   libpython_plugin_srcs = [ 'planner-python-plugin.c' ]
   libpython_plugin_module = shared_module('python-plugin', [libpython_plugin_srcs],
-    dependencies: [pygtk_dep, python_dep],
+    dependencies: [planner_deps, pygtk_dep, python_dep],
     include_directories: [toplevel_inc],
     install: true,
     install_dir: join_paths(get_option('libdir'), 'planner/plugins'),


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