[gvfs] build: Define meson information early



commit 28dfdbf9c759a4681c6b43b179079cba09e571b4
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue Dec 18 08:49:07 2018 +0100

    build: Define meson information early
    
    The used meson modules, default directories and includes have been
    moved to the start of the build file, just after project related
    information, so they are available early.
    
    The way `po` directory path is defined has also been changed to
    avoid the use of the `source_root` function.

 meson.build | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/meson.build b/meson.build
index d224cdee..d5916082 100644
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,17 @@ gvfs_namespace = 'org.gtk.vfs'
 
 gvfs_debug = get_option('buildtype').contains('debug')
 
+gnome = import('gnome')
+i18n = import('i18n')
+pkg = import('pkgconfig')
+
+po_dir = meson.current_source_dir() / 'po'
+
+top_inc = include_directories('.')
+
+service_conf = configuration_data()
+service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
+
 cc = meson.get_compiler('c')
 
 config_h = configuration_data()
@@ -453,17 +464,6 @@ endif
 enable_devel_utils = get_option('devel_utils')
 enable_installed_tests = get_option('installed_tests')
 
-gnome = import('gnome')
-i18n = import('i18n')
-pkg = import('pkgconfig')
-
-service_conf = configuration_data()
-service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
-
-po_dir = meson.source_root() / 'po'
-
-top_inc = include_directories('.')
-
 subdir('common')
 subdir('metadata')
 subdir('client')


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