[rygel/wip/meson: 50/50] meson: Only search for tracker if plugin is enabled



commit 8cefa6bed0a3577fffbfa25e8f7c5856edd571df
Author: Jens Georg <mail jensge org>
Date:   Mon Nov 19 14:49:46 2018 +0100

    meson: Only search for tracker if plugin is enabled

 meson.build                     | 3 ---
 src/plugins/tracker/meson.build | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 87071475..cab6efd6 100644
--- a/meson.build
+++ b/meson.build
@@ -108,8 +108,6 @@ else
     gtk = disabler()
 endif
 
-tracker_sparql = dependency('tracker-sparql-2.0')
-
 posix = vala.find_library('posix')
 
 sed = find_program('sed')
@@ -144,7 +142,6 @@ mx_export_deps = common_deps + [gio, gio_unix, gstreamer, gstreamer_pbu,
                                 posix, gupnp_dlna_gst, gstreamer_tag, libxml,
                                 soup]
 mx_plugin_deps = common_deps + [gstreamer, gstreamer_pbu, gio_unix, gupnp_dlna]
-tracker_plugin_deps = common_deps + [tracker_sparql]
 ui_deps = common_deps + [gtk]
 
 configure_file(output: 'config.h', configuration: conf)
diff --git a/src/plugins/tracker/meson.build b/src/plugins/tracker/meson.build
index 502f0b22..1d925dda 100644
--- a/src/plugins/tracker/meson.build
+++ b/src/plugins/tracker/meson.build
@@ -39,7 +39,11 @@ rygel_tracker_sources = [
 
 shared_module('rygel-tracker',
               rygel_tracker_sources,
-              dependencies : tracker_plugin_deps + [build_config, rygel_core, rygel_server],
+              dependencies : [
+                  common_deps,
+                  dependency('tracker-sparql-2.0'),
+                  build_config, rygel_core, rygel_server
+              ],
               c_args : ['-DG_LOG_DOMAIN="RygelTracker"'],
               install : true,
               install_dir : rygel_plugindir)


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