[libhandy] meson: Don't specify all build dependencies for libhandy_dep
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhandy] meson: Don't specify all build dependencies for libhandy_dep
- Date: Fri, 12 Feb 2021 11:32:26 +0000 (UTC)
commit 83c3a30b8b60be4fd78e0b8860500c395794fe80
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Fri Feb 12 14:49:13 2021 +0500
meson: Don't specify all build dependencies for libhandy_dep
That variable exists for subprojects. We don't want to propagate our build
deps that we don't expose in the API outside, there's no guarantee they
even exist for that project.
glade/meson.build | 1 +
src/meson.build | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/glade/meson.build b/glade/meson.build
index d8e0d7ac..7f467b58 100644
--- a/glade/meson.build
+++ b/glade/meson.build
@@ -25,6 +25,7 @@ libglade_hdy_sources = [
libglade_hdy_deps = [
libhandy_dep,
gladeui_dep,
+ cc.find_library('m', required: false),
]
libglade_hdy_args = []
diff --git a/src/meson.build b/src/meson.build
index 042aad65..c201f34e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -190,16 +190,24 @@ libhandy_sources = [
glib_min_version = '>= 2.44'
+gio_dep = dependency('gio-2.0', version: glib_min_version)
+gtk_dep = dependency('gtk+-3.0', version: '>= 3.24.1')
+
libhandy_deps = [
dependency('glib-2.0', version: glib_min_version),
- dependency('gio-2.0', version: glib_min_version),
dependency('gmodule-2.0', version: glib_min_version),
dependency('fribidi'),
- dependency('gtk+-3.0', version: '>= 3.24.1'),
+ gio_dep,
+ gtk_dep,
cc.find_library('m', required: false),
cc.find_library('rt', required: false),
]
+libhandy_public_deps = [
+ gio_dep,
+ gtk_dep,
+]
+
libhandy_c_args = [
'-DG_LOG_DOMAIN="Handy"',
]
@@ -257,7 +265,7 @@ libhandy = shared_library(
libhandy_dep = declare_dependency(
sources: libhandy_generated_headers,
- dependencies: libhandy_deps,
+ dependencies: libhandy_public_deps,
link_with: libhandy,
include_directories: include_directories('.'),
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]