[libchamplain: 4/8] meson: Split lib includedirs
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain: 4/8] meson: Split lib includedirs
- Date: Sat, 23 Feb 2019 17:51:55 +0000 (UTC)
commit 5c61331625ff964dcc42238151d41ba674618986
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date: Thu Feb 21 18:14:19 2019 +0100
meson: Split lib includedirs
champlain-gtk/meson.build | 10 ++++++----
champlain/meson.build | 25 +++++++++----------------
2 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build
index 680b132..5309b4d 100644
--- a/champlain-gtk/meson.build
+++ b/champlain-gtk/meson.build
@@ -29,12 +29,14 @@ libchamplain_gtk_c_args = [
libchamplain_gtk_link_args = [
]
+libchamplain_gtk_includedir = join_paths(
+ pkgincludedir,
+ 'champlain-gtk',
+)
+
install_headers(
libchamplain_gtk_public_h,
- install_dir: join_paths(
- pkgincludedir,
- 'champlain-gtk',
- )
+ install_dir: libchamplain_gtk_includedir,
)
libchamplain_gtk_sha = library(
diff --git a/champlain/meson.build b/champlain/meson.build
index 1076af6..1431c75 100644
--- a/champlain/meson.build
+++ b/champlain/meson.build
@@ -114,6 +114,11 @@ libchamplain_c_args = [
libchamplain_link_args = [
]
+libchamplain_includedir = join_paths(
+ pkgincludedir,
+ 'champlain',
+)
+
features_h = configuration_data()
if build_with_memphis
features_h.set('CHAMPLAIN_HAS_MEMPHIS', '1')
@@ -123,10 +128,7 @@ libchamplain_features_h = configure_file(
output: 'champlain-features.h',
configuration: features_h,
install: true,
- install_dir: join_paths(
- pkgincludedir,
- 'champlain',
- )
+ install_dir: libchamplain_includedir,
)
version_h = configuration_data()
@@ -140,10 +142,7 @@ libchamplain_version_h = configure_file(
output: 'champlain-version.h',
configuration: version_h,
install: true,
- install_dir: join_paths(
- pkgincludedir,
- 'champlain',
- )
+ install_dir: libchamplain_includedir,
)
libchamplain_public_h += [
@@ -157,10 +156,7 @@ libchamplain_enums = gnome.mkenums(
h_template: 'champlain-enum-types.h.in',
c_template: 'champlain-enum-types.c.in',
install_header: true,
- install_dir: join_paths(
- pkgincludedir,
- 'champlain',
- )
+ install_dir: libchamplain_includedir,
)
libchamplain_enums_h = libchamplain_enums.get(1)
@@ -171,10 +167,7 @@ libchamplain_sources += [
install_headers(
libchamplain_public_h,
- install_dir: join_paths(
- pkgincludedir,
- 'champlain',
- )
+ install_dir: libchamplain_includedir,
)
libchamplain_sha = library(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]