colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Define meson information early

Browse Source 
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.
This commit is contained in:
Iñigo Martínez
2019-08-28 11:44:05 +02:00
committed by Thomas Haller
parent bfbcf8f3fe
commit 48bb5b68e3
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meson.build
View File

@@ -65,6 +65,24 @@ libnm_pkgincludedir = join_paths(nm_includedir, libnm_name)
nm_debug = get_option('buildtype').contains('debug')
gnome = import('gnome')
i18n = import('i18n')
pkg = import('pkgconfig')
po_dir = join_paths(meson.source_root(), 'po')
intltool_merge = find_program('intltool-merge')
intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
top_inc = include_directories('.')
perl = find_program('perl')
xsltproc = find_program('xsltproc')
check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh'))
cc = meson.get_compiler('c')
config_h = configuration_data()
@@ -783,22 +801,6 @@ else
fi
'''
gnome = import('gnome')
i18n = import('i18n')
pkg = import('pkgconfig')
po_dir = join_paths(meson.source_root(), 'po')
intltool_merge = find_program('intltool-merge')
intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
perl = find_program('perl')
xsltproc = find_program('xsltproc')
check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh'))
content_files = []
# FIXME: every plugin calls to this:
@@ -814,8 +816,6 @@ check_so_symbols = \
LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
'''
top_inc = include_directories('.')
subdir('introspection')
subdir('shared')
subdir('libnm-core')