Merge branch 'meson-msvc-toolset' into 'master'

Meson/Visual Studio builds: Include toolset version by default (master branch)

See merge request cairo/cairomm!8

7 files changed, 28 insertions, 6 deletions

diff --git a/MSVC_NMake/README b/MSVC_NMake/README
index 6a60d62..cf920ce 100644
--- a/MSVC_NMake/README
+++ b/MSVC_NMake/README
@@ -8,7 +8,11 @@ Building cairomm-1.16 with Visual Studio .NET 2017 or later
 * Run the tests.
 * Now the built DLL and .lib files use the toolset version ('vc141' for Visual Studio 2017 and 'vc142' for Visual Studio
   2019) instead of the Visual Studio version ('vc150' for Visual Studio 2017) by default.  If using the old naming style,
-  please note that libsigc++-3.x must be built with this option enabled as well, if building it with NMake.
+  please note that libsigc++-3.x must be built with this option enabled as well, if building it with NMake.

+  For the Meson builds, pass in the option '-Dmsvc14x-parallel-installable=false' to the Meson configure command line

+  to avoid having the toolset version in the final DLL and .lib filenames; again, this is only recommended if it is

+  inconvenient to re-build the dependent code, and this option should be used when building items that depend on cairomm,

+  if this option is provided.
 
 Cedric Gustin
 08/18/2006
@@ -17,4 +21,4 @@ Armin Burgmeier
 09/29/2010
 
 Chun-wei Fan
-09/10/2015
+09/10/2015

diff --git a/cairomm/meson.build b/cairomm/meson.build
index afc724f..e12343b 100644
--- a/cairomm/meson.build
+++ b/cairomm/meson.build
@@ -1,7 +1,7 @@
 # cairomm
 
 # Input: cairomm_build_dep, cairomm_pcname, cairomm_libversion, cairomm_rc,
-#        is_msvc
+#        is_msvc, cairomm_libname
 # Output: source_h_files, cairomm_dep
 
 # There are no built source files in cairomm.
@@ -79,7 +79,7 @@ endif
 
 extra_include_dirs = ['..']
 
-cairomm_library = library(cairomm_pcname,
+cairomm_library = library(cairomm_libname,
   cairomm_cc, extra_cairomm_objects,
   version: cairomm_libversion,
   include_directories: extra_include_dirs,
diff --git a/configure.ac b/configure.ac
index 0edd14e..28bf883 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ PKG_PROG_PKG_CONFIG
 
 AC_SUBST([CAIROMM_EXTRA_LIBS], [''])
 AC_SUBST([CAIROMM_MODULES], ['cairo >= 1.10.0 sigc++-3.0 >= 2.5.1'])
+AC_SUBST([MSVC_TOOLSET_VER], [''])
 cairomm_allmodules=$CAIROMM_MODULES
 CAIROMM_INSTALL_PC='data/cairomm-1.16.pc'
 
diff --git a/data/cairomm.pc.in b/data/cairomm.pc.in
index f7c2d69..b6d19a2 100644
--- a/data/cairomm.pc.in
+++ b/data/cairomm.pc.in
@@ -15,5 +15,5 @@ Description: C++ binding for the cairo graphics library
 Version: @PACKAGE_VERSION@
 URL: http://www.cairographics.org/cairomm/
 Requires: @CAIROMM_MODULES@
-Libs: -L${libdir} -lcairomm-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@
+Libs: -L${libdir} -lcairomm@MSVC_TOOLSET_VER@-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@
 Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
diff --git a/data/meson.build b/data/meson.build
index 5d9567c..509ed36 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@
 
 # Input: install_prefix, install_libdir, install_datadir, install_includedir,
 #        install_pkgconfigdir, cairomm_pcname, cairomm_api_version,
-#        cairomm_requires
+#        cairomm_requires, msvc14x_toolset_ver
 # Output: -
 
 pkg_conf_data = configuration_data()
@@ -17,6 +17,7 @@ pkg_conf_data.set('CAIROMM_MODULE_NAME', cairomm_pcname)
 pkg_conf_data.set('CAIROMM_API_VERSION', cairomm_api_version)
 pkg_conf_data.set('CAIROMM_MODULES', cairomm_requires)
 pkg_conf_data.set('CAIROMM_EXTRA_LIBS', cairomm_extra_libs)
+pkg_conf_data.set('MSVC_TOOLSET_VER', msvc14x_toolset_ver)
 
 configure_file(
   input: 'cairomm.pc.in',
diff --git a/meson.build b/meson.build
index f6eacd8..b4bfc0c 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,8 @@ build_documentation = build_documentation_opt == 'true' or \
 build_examples = get_option('build-examples')
 build_tests_opt = get_option('build-tests')
 
+use_msvc14x_toolset_ver = get_option('msvc14x-parallel-installable')
+
 # Installation directories are relative to {prefix}.
 install_prefix = get_option('prefix')
 install_includedir = get_option('includedir')
@@ -207,6 +209,9 @@ endif
 warning_flags = cpp_compiler.get_supported_arguments(warning_flags)
 add_project_arguments(warning_flags, language: 'cpp')
 
+# Add toolset version in builds done with Visual Studio 2017 or later
+msvc14x_toolset_ver = ''
+
 # MSVC: Ignore warnings that aren't really harmful, but make those
 #       that should not be overlooked stand out.
 if is_msvc
@@ -214,8 +219,17 @@ if is_msvc
     disabled_warning = cpp_compiler.get_supported_arguments(wd)
     add_project_arguments(disabled_warning, language: 'cpp')
   endforeach
+  if use_msvc14x_toolset_ver
+    if cpp_compiler.version().version_compare('>=19.20')
+      msvc14x_toolset_ver = '-vc142'
+    elif cpp_compiler.version().version_compare('>=19.10')
+      msvc14x_toolset_ver = '-vc141'
+    endif
+  endif
 endif
 
+cairomm_libname = meson.project_name() + msvc14x_toolset_ver + '-' + cairomm_api_version
+
 # Create cairommconfig.h.
 mm_conf_data = configuration_data()
 if not build_deprecated_api
diff --git a/meson_options.txt b/meson_options.txt
index 4ada13e..df57c5a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,3 +16,5 @@ option('build-tests', type: 'combo', choices: ['false', 'if-dependencies-found',
   value: 'if-dependencies-found', description: 'Build test programs (requires Boost Test and Fontconfig or Windows)')
 option('boost-shared', type: 'boolean',
   value: false, description: 'Use shared version of boost')
+option('msvc14x-parallel-installable', type: 'boolean', value: true,
+  description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019')