[libgit2-glib/wip/inigomartinez/meson: 9/13] meson: Reorganize included directories



commit 6667090c44a24e345b936334b3d1b41111916105
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Jan 19 16:34:12 2018 +0100

    meson: Reorganize included directories
    
    The `libgit2_glib_inc` variable holds two directories, the source
    root and also the `libgit2-glib` directory. However, this is not
    necessary, because a variable for the source root already exists,
    which is called `core_inc`, and the example programs which use
    the `libgit2_glib_inc` variable don't need the source root include.
    
    Now the `libgit2_glib_inc` variable only holds the `libgit2-glib`
    directory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792699

 libgit2-glib/meson.build |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index dbcdcd2..8362f25 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -1,3 +1,5 @@
+libgit2_glib_inc = include_directories('.')
+
 headers = [
   'ggit-annotated-commit.h',
   'ggit-blame.h',
@@ -221,9 +223,8 @@ pkg.generate(
 )
 
 # Internal dependency, for tests and benchmarks
-libgit2_glib_inc = include_directories([ '.', '..' ])
 libgit2_glib_dep = declare_dependency(link_with: libgit2_glib,
-                                      include_directories: [ libgit2_glib_inc ],
+                                      include_directories: [ core_inc, libgit2_glib_inc ],
                                       dependencies: platform_deps,
                                       # Everything that uses libgit2-glib needs this built to compile
                                       sources: enum_types[1])


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