[eog: 12/21] build: Define meson information early



commit 140445a3334c26a6a77bbd33f6453f1fca8c0c98
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Jun 28 07:59:03 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 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index 94181bc1..081be73a 100644
--- a/meson.build
+++ b/meson.build
@@ -27,6 +27,17 @@ eog_pkglibexecdir = get_option('libexecdir') / meson.project_name()
 
 eog_pluginsdir = eog_pkglibdir / 'plugins'
 
+gnome = import('gnome')
+i18n = import('i18n')
+pkg = import('pkgconfig')
+
+source_root = meson.current_source_dir()
+
+data_dir = source_root / 'data'
+po_dir = source_root / 'po'
+
+top_inc = include_directories('.')
+
 cc = meson.get_compiler('c')
 
 config_h = configuration_data()
@@ -184,15 +195,6 @@ if enable_x11
   x11_dep = dependency('x11')
 endif
 
-gnome = import('gnome')
-i18n = import('i18n')
-pkg = import('pkgconfig')
-
-data_dir = meson.source_root() / 'data'
-po_dir = meson.source_root() / 'po'
-
-top_inc = include_directories('.')
-
 subdir('data')
 
 if enable_libjpeg
@@ -225,7 +227,7 @@ meson.add_install_script(
 )
 
 output = 'Configure summary:\n\n'
-output += '  Source code location .......:  ' + meson.source_root() + '\n'
+output += '  Source code location .......:  ' + source_root + '\n'
 output += '  Compiler ...................:  ' + cc.get_id() + '\n'
 output += '  Extra Compiler Warnings ....:  ' + ' '.join(compiler_flags) + '\n'
 output += '  EXIF support ...............:  ' + enable_libexif.to_string() + '\n'


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