[gnome-disk-utility] build: Define meson information early



commit b9dbeb8a96360aed0b5bd5600c48fb63fdec907e
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jul 4 07:36:50 2019 +0200

    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 some directory paths are defined has also been changed to
    avoid the use of the `source_root` function because is discouraged.

 meson.build | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index db2e13fc..53f1bb57 100644
--- a/meson.build
+++ b/meson.build
@@ -17,6 +17,13 @@ gdu_localedir = get_option('localedir')
 gdu_mandir = get_option('mandir')
 gdu_sysconfdir = get_option('sysconfdir')
 
+gnome = import('gnome')
+i18n = import('i18n')
+
+po_dir = meson.current_source_dir() / 'po'
+
+top_inc = include_directories('.', 'src')
+
 cc = meson.get_compiler('c')
 
 config_h = configuration_data()
@@ -92,13 +99,6 @@ enable_logind = get_option('logind') != 'none'
 config_h.set('HAVE_LOGIND', enable_logind,
              description: 'Define to 1 if logind API is available')
 
-gnome = import('gnome')
-i18n = import('i18n')
-
-po_dir = meson.source_root() / 'po'
-
-top_inc = include_directories('.', 'src')
-
 subdir('src/libgdu')
 subdir('src/disks')
 subdir('src/disk-image-mounter')


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