[gvfs/wip/oholy/meson-version: 13/15] build: Use path strings in include_directories



commit 75d8fb3df62f921b9ff3b6068c05ccdba526af20
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Apr 4 13:21:15 2019 +0200

    build: Use path strings in include_directories
    
    Since meson 0.50.0, plain strings can be used rather than include
    directory objects[0].
    
    Taking advantage of this feature, some include directory objects
    have been replaced.
    
    [0] http://mesonbuild.com/Release-notes-for-0-50-0.html#include_directories-accepts-a-string

 daemon/trashlib/meson.build | 2 +-
 metadata/meson.build        | 2 +-
 monitor/proxy/meson.build   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/daemon/trashlib/meson.build b/daemon/trashlib/meson.build
index 8b8e20c3..2e1b6418 100644
--- a/daemon/trashlib/meson.build
+++ b/daemon/trashlib/meson.build
@@ -20,7 +20,7 @@ libtrash = static_library(
 )
 
 libtrash_dep = declare_dependency(
-  include_directories: include_directories('.'),
+  include_directories: '.',
   dependencies: gio_dep,
   link_with: libtrash,
 )
diff --git a/metadata/meson.build b/metadata/meson.build
index 905d577b..4e120d18 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -66,7 +66,7 @@ libmetadata = static_library(
 
 libmetadata_dep = declare_dependency(
   sources: dbus_sources[1],
-  include_directories: include_directories('.'),
+  include_directories: '.',
   dependencies: deps,
   link_with: libmetadata,
 )
diff --git a/monitor/proxy/meson.build b/monitor/proxy/meson.build
index 18d0cf5c..7b46a908 100644
--- a/monitor/proxy/meson.build
+++ b/monitor/proxy/meson.build
@@ -69,7 +69,7 @@ libgvfsproxyvolumemonitordaemon_noin = static_library(
 )
 
 libgvfsproxyvolumemonitordaemon_noin_dep = declare_dependency(
-  include_directories: include_directories('.'),
+  include_directories: '.',
   dependencies: gio_dep,
   link_with: libgvfsproxyvolumemonitordaemon_noin,
 )


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