[pangomm/meson.msvc: 1/2] meson.build: Fix library search error messages



commit 0a599dacc4531042255aa0e038a76f1e793ad3a9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Oct 22 13:53:59 2019 +0800

    meson.build: Fix library search error messages
    
    The .format(...) items are placed wrongly in the cases that the required
    -mm libraries are not found.  Fix this.
    
    Make these messages clearer to people that all 3 C++-17 versions of the
    cairomm, glibmm and sigc++ .lib's are required by combining the 3
    assert messages into a single assert message.

 meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 01ac359..ae0927b 100644
--- a/meson.build
+++ b/meson.build
@@ -134,9 +134,7 @@ if is_msvc
   endforeach
 
   # Now make sure the appropriate -mm libraries are found
-  assert(glibmm_dep.found(), 'Appropriate glibmm-vcxx0@0@-2_@1@.format(debugsuffix, 
glibmm_req_minor_ver).lib is required')
-  assert(cairomm_dep.found(), 'Appropriate cairomm-vcxx0@0@-2_@1@.format(debugsuffix, 
cairomm_req_minor_ver).lib is required')
-  assert(sigc_dep.found(), 'Appropriate sigc-vcxx0@0@-3_0.format(debugsuffix).lib is required')
+  assert(glibmm_dep.found() and cairomm_dep.found() and sigc_dep.found(), 'Appropriate 
glibmm-vcxx0@0@-2_@1@.lib, cairomm-vcxx0@0@-1_@2@.lib and sigc-vcxx0@0@-3_0.lib are 
required'.format(debugsuffix, glibmm_req_minor_ver, cairomm_req_minor_ver))
 
   pangomm_requires = ' '.join([
     'pangocairo', pangocairo_req,


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