[glibmm/kjellahl/meson-build-2-62] meson: Don't use `objects:` in glibmm, giomm
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/kjellahl/meson-build-2-62] meson: Don't use `objects:` in glibmm, giomm
- Date: Thu, 5 Mar 2020 10:11:59 +0000 (UTC)
commit b03c6d558d912ab66cafac37d5c9fdd63e46d61b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Mar 5 18:07:44 2020 +0800
meson: Don't use `objects:` in glibmm, giomm
Instead, use or extend `link_with:`
Please see: https://gitlab.gnome.org/GNOME/glibmm/-/merge_requests/28#note_731510
gio/giomm/meson.build | 3 +--
glib/glibmm/meson.build | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gio/giomm/meson.build b/gio/giomm/meson.build
index a64cb8c7..0b4580da 100644
--- a/gio/giomm/meson.build
+++ b/gio/giomm/meson.build
@@ -379,12 +379,11 @@ if is_host_windows
endif
giomm_library = library(giomm_pcname, extra_giomm_objects,
- objects: gio_int_lib.extract_all_objects(),
version: glibmm_libversion,
dependencies: giomm_build_dep,
link_depends: giomm_def,
link_args: giomm_extra_link_args,
- link_with: glibmm_library,
+ link_with: [gio_int_lib, glibmm_library],
install: true,
)
diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build
index c69dd3c8..da806bd7 100644
--- a/glib/glibmm/meson.build
+++ b/glib/glibmm/meson.build
@@ -337,7 +337,7 @@ if is_host_windows
endif
glibmm_library = library(glibmm_pcname, extra_glibmm_objects,
- objects: glib_int_lib.extract_all_objects(),
+ link_with: glib_int_lib,
version: glibmm_libversion,
dependencies: glibmm_build_dep,
link_depends: glibmm_def,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]