summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2023-01-14 20:48:04 -0500
committerDavid Robillard <d@drobilla.net>2023-01-14 20:48:04 -0500
commite899eb2ec4396875c732320197b481143a5335aa (patch)
treef24052fd91e135211cb7ab07713cc5177238b104
parent65f4d1f58566fc6b1feaf29f5e87f104ad3baa9e (diff)
downloadganv-master.tar.gz
ganv-master.tar.bz2
ganv-master.zip
Fix and simplify library naming on WindowsHEADmaster
-rw-r--r--meson.build18
-rw-r--r--meson/library/meson.build31
2 files changed, 16 insertions, 33 deletions
diff --git a/meson.build b/meson.build
index 2a88fed..a0d66d5 100644
--- a/meson.build
+++ b/meson.build
@@ -59,6 +59,20 @@ gvc_dep = dependency('libgvc',
include_type: 'system',
required: get_option('graphviz'))
+##########################
+# Platform Configuration #
+##########################
+
+# Use versioned name everywhere to support parallel major version installations
+if host_machine.system() == 'windows'
+ if get_option('default_library') == 'both'
+ error('default_library=both is not supported on Windows')
+ endif
+ soversion = ''
+else
+ soversion = meson.project_version().split('.')[0]
+endif
+
#################
# Configuration #
#################
@@ -143,7 +157,6 @@ sources = files(
)
# Set appropriate arguments for building against the library type
-subdir('meson/library')
extra_args = []
if get_option('default_library') == 'static'
extra_args = ['-DGANV_STATIC']
@@ -159,13 +172,14 @@ ganv_marshal_sources = gnome.genmarshal(
# Build shared and/or static library
libganv = library(
- meson.project_name() + library_suffix,
+ versioned_name,
sources + ganv_marshal_sources,
c_args: c_suppressions + extra_args + ['-DGANV_INTERNAL'],
cpp_args: cpp_suppressions + extra_args + ['-DGANV_INTERNAL'],
dependencies: [gtk2_dep, gtkmm2_dep, gvc_dep, intl_dep, m_dep],
include_directories: include_dirs,
install: true,
+ soversion: soversion,
version: meson.project_version(),
)
diff --git a/meson/library/meson.build b/meson/library/meson.build
deleted file mode 100644
index 756a222..0000000
--- a/meson/library/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: 0BSD OR ISC
-
-# General definitions for building libraries.
-#
-# These are essentially workarounds for Meson/Windows/MSVC. Unfortunately,
-# Meson's default_library option doesn't support shared and static builds very
-# well. In particular, it's often necessary to define different symbols for
-# static and shared builds of libraries so that symbols can be exported. To
-# work around this, default_library=both isn't supported on Windows. On other
-# platforms with GCC-like compilers, we can support both because symbols can
-# safely be exported in the same way (giving them default visibility) in both
-# static and shared builds.
-
-default_library = get_option('default_library')
-host_system = host_machine.system()
-
-# Abort on Windows with default_library=both
-if host_system == 'windows' and default_library == 'both'
- error('default_library=both is not supported on Windows')
-endif
-
-# Set library_suffix to the suffix for libraries
-if host_system == 'windows' and default_library == 'shared'
- # Meson appends a version to the name only for DLLs, which leads to
- # inconsistent library names, like `mylib-1-1`. So, provide no suffix to
- # ultimately get the same name as on other platforms, like `mylib-1`.
- library_suffix = ''
-else
- library_suffix = '-@0@'.format(meson.project_version().split('.')[0])
-endif