[glibmm/kjellahl/meson-build-master] meson.build: Tidy up a bit



commit 8e09f4535cf55ceadc01c88ad25ad00089da7dd2
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Mar 2 19:39:13 2020 +0100

    meson.build: Tidy up a bit
    
    The definitions of glibmm_build_dep, giomm_build_dep, glibmm_requires and
    giomm_requires can be simplified.

 meson.build | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 80d7dd5e..945fbdaa 100644
--- a/meson.build
+++ b/meson.build
@@ -98,14 +98,15 @@ install_pkgconfigdir = install_libdir / 'pkgconfig'
 sigcxx_req = '>= 3.0.0'
 glib_req = '>= 2.63.0'
 
-# Glib supported pkg-config files on MSVC files for a good while,
-# so just use that.
+# There are pkg-config files for sigc++ and glib on MSVC, so just use that.
+sigcxx_dep = dependency('sigc++-3.0', version: sigcxx_req)
 glib_dep = dependency('glib-2.0', version: glib_req)
 gobject_dep = dependency('gobject-2.0', version: glib_req)
 gmodule_dep = dependency('gmodule-2.0', version: glib_req)
 
-glibmm_build_dep = [glib_dep, gobject_dep, gmodule_dep]
+glibmm_build_dep = [sigcxx_dep, glib_dep, gobject_dep, gmodule_dep]
 glibmm_requires = [
+  'sigc++-3.0', sigcxx_req,
   'glib-2.0', glib_req,
   'gobject-2.0', glib_req,
   'gmodule-2.0', glib_req,
@@ -120,12 +121,6 @@ if not is_host_windows
   giomm_requires += ['gio-unix-2.0', glib_req]
 endif
 
-sigcxx_dep = dependency('sigc++-3.0', version: sigcxx_req)
-glibmm_requires += ['sigc++-3.0', sigcxx_req]
-giomm_requires += ['sigc++-3.0', sigcxx_req]
-
-glibmm_build_dep += [sigcxx_dep]
-giomm_build_dep += [sigcxx_dep]
 glibmm_requires = ' '.join(glibmm_requires)
 giomm_requires = ' '.join(giomm_requires)
 


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