[atkmm/atkmm-2-28] codegen/extradefs/meson.build: Apply toolset version as well



commit 4eeaded9460c37482b85787e7016179898aff579
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jun 29 18:06:41 2020 +0800

    codegen/extradefs/meson.build: Apply toolset version as well
    
    We are already building the 'glibmm_generate_extra_defs-2.4' library with the
    toolset version applied by default on Visual Studio 2015+, so we should do the
    same here.

 codegen/extradefs/meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/codegen/extradefs/meson.build b/codegen/extradefs/meson.build
index 6d432b2..de68b9a 100644
--- a/codegen/extradefs/meson.build
+++ b/codegen/extradefs/meson.build
@@ -1,10 +1,11 @@
 # codegen/extradefs
 
-# Input: cpp_compiler, atkmm_build_dep, install_libdir, atkmm_pcname
+# Input: cpp_compiler, atkmm_build_dep, install_libdir, atkmm_pcname,
+#        msvc14x_toolset_ver
 # Output: m4_files, install_m4dir
 
 glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
-  'glibmm_generate_extra_defs-2.4',
+  'glibmm_generate_extra_defs@0@-2.4'.format(msvc14x_toolset_ver),
 )
 
 executable('generate_extra_defs', 'generate_extra_defs_atk.cc',


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