[gnome-builder] build: Install bundled template-glib into private directories
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: Install bundled template-glib into private directories
- Date: Wed, 7 Jun 2017 02:10:33 +0000 (UTC)
commit 16a512dabfbc0fe6ae80fec2f9a94763d993a912
Author: Patrick Griffis <tingping tingping se>
Date: Tue Jun 6 22:09:29 2017 -0400
build: Install bundled template-glib into private directories
libide/meson.build | 9 ++++-----
meson.build | 8 +++++++-
subprojects/template-glib | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/libide/meson.build b/libide/meson.build
index 6fb4682..f7fa3eb 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -16,8 +16,7 @@ libide_enum_headers = [
'workbench/ide-layout-stack-split.h',
]
-libide_header_subdir = 'gnome-builder-' + meson.project_version() + '/libide'
-libide_header_dir = join_paths(get_option('includedir'), libide_header_subdir)
+libide_header_dir = pkgincludedir + '/libide'
libide_enums = gnome.mkenums('ide-enums',
h_template: 'ide-enums.h.in',
@@ -212,10 +211,10 @@ libide_debug_h = configure_file(
foreach header: libide_public_headers
header_split = header.split('/')
if header_split.length() == 2
- header_path = join_paths(libide_header_subdir, header_split[0])
- install_headers(header, subdir: header_path)
+ header_path = join_paths(libide_header_dir, header_split[0])
+ install_headers(header, install_dir: header_path)
else
- install_headers(header, subdir: libide_header_subdir)
+ install_headers(header, install_dir: libide_header_dir)
endif
endforeach
diff --git a/meson.build b/meson.build
index fcde6b5..3d99923 100644
--- a/meson.build
+++ b/meson.build
@@ -16,6 +16,7 @@ MICRO_VERSION = version_split[2]
pkglibdir_abs = join_paths(get_option('prefix'), get_option('libdir'), 'gnome-builder')
pkglibdir = join_paths(get_option('libdir'), 'gnome-builder')
+pkgincludedir = join_paths(get_option('includedir'), 'gnome-builder-' + meson.project_version())
pkggirdir = join_paths(get_option('datadir'),'gnome-builder', 'gir-1.0')
pkgtypelibdir = join_paths(get_option('libdir'), 'gnome-builder', 'girepository-1.0')
pkgvapidir = join_paths(get_option('datadir'), 'gnome-builder/vapi')
@@ -143,7 +144,12 @@ if not libtemplate_glib_dep.found()
libtemplate_glib = subproject('template-glib',
default_options: [
'with_introspection=true',
- 'with_vapi=true'
+ 'with_vapi=true',
+ 'pkglibdir=' + pkglibdir,
+ 'pkgincludedir=' + pkgincludedir,
+ 'pkggirdir=' + pkggirdir,
+ 'pkgvapidir=' + pkgvapidir,
+ 'pkgtypelibdir=' + pkgtypelibdir,
]
)
libtemplate_glib_dep = libtemplate_glib.get_variable('libtemplate_glib_dep')
diff --git a/subprojects/template-glib b/subprojects/template-glib
index 560a3f8..2c0efb5 160000
--- a/subprojects/template-glib
+++ b/subprojects/template-glib
@@ -1 +1 @@
-Subproject commit 560a3f8cffe5e5f0a3945a3cf5ac9f0c13660a3a
+Subproject commit 2c0efb5d7258f2a6ad5b64109957390d441f18bc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]