[gtkmm] meson: Remove gmmproc-dir option



commit 6e097c36304e91bf39807860e75998ab899a31cb
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 30 11:13:50 2020 +0800

    meson: Remove gmmproc-dir option
    
    It was not used, anyways, since we look for the -mm dependencies only via
    pkg-config, which will give us the info we need

 meson.build       | 7 +------
 meson_options.txt | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index d26608b2..d2d85a0b 100644
--- a/meson.build
+++ b/meson.build
@@ -126,12 +126,7 @@ glibmm_dep = dependency('glibmm-2.@0@'.format(glibmm_req_minor_ver), version: gl
 giomm_dep = dependency('giomm-2.@0@'.format(glibmm_req_minor_ver), version: glibmm_req)
 
 # Where to find gmmproc and generate_wrap_init.pl.
-if glibmm_dep.found() and glibmm_dep.type_name() == 'pkgconfig'
-  gmmproc_dir = glibmm_dep.get_pkgconfig_variable('gmmprocdir')
-else
-  # We don't have a pkg-config file for glibmm, so use build option.
-  gmmproc_dir = get_option('gmmproc-dir')
-endif
+gmmproc_dir = glibmm_dep.get_pkgconfig_variable('gmmprocdir')
 
 gmmproc_extra_m4_dirs = [pangomm_dep.get_pkgconfig_variable('gmmprocm4dir')]
 if atkmm_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index eabeaf86..44f54f59 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,5 +12,3 @@ option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-m
   value: 'if-maintainer-mode', description: 'Build and install the documentation')
 option('build-demos', type: 'boolean', value: true, description: 'Build demo programs')
 option('build-tests', type: 'boolean', value: true, description: 'Build test programs')
-option('gmmproc-dir', type: 'string', value: '',
-  description: 'Directory containing gmmproc and its PERL modules (for MSVC builds only)')


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