aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-07 13:43:25 +0900
committer坂本 貴史 <o-takashi@sakamocchi.jp>2023-10-08 11:38:33 +0900
commit6a85d388ec84050ce352d86745c5aa4cd8606ca0 (patch)
tree6200634cbaf6742aa5f53ec6f2bfc4847246a035
parent68a5156525badb43d67c5cb44dbcfba4928258f7 (diff)
downloadlibhinoko-6a85d388ec84050ce352d86745c5aa4cd8606ca0.tar.gz
meson: bump minimal version up to 0.56.0 for meson.global_build_root()
The meson.global_build_root() was newly available to refer to global build root directory wherever the meson file locates. Reference: https://mesonbuild.com/Release-notes-for-0-56-0.html#mesonbuild_root-and-mesonsource_root-are-deprecated Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--README.rst4
-rw-r--r--meson.build4
2 files changed, 4 insertions, 4 deletions
diff --git a/README.rst b/README.rst
index d42088c..5f35f4b 100644
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,7 @@ Dependencies
Requirements to build
=====================
-- Meson 0.54.0 or later
+- Meson 0.56.0 or later
- Ninja
- PyGObject (optional to run unit tests)
- gi-docgen (optional to generate API documentation)
@@ -98,7 +98,7 @@ This is a sample of wrap file to satisfy dependency on libhinoko by
::
- $ cat subproject/hinoko.wrap
+ $ cat subprojects/hinoko.wrap
[wrap-git]
directory = hinoko
url = https://git.kernel.org/pub/scm/libs/ieee1394/libhinoko.git
diff --git a/meson.build b/meson.build
index 7b49822..42649f7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('hinoko', 'c',
version: '0.9.1',
license: 'LGPL-2.1+',
- meson_version: '>= 0.54.0',
+ meson_version: '>= 0.58.0',
)
version = meson.project_version().split('.')
@@ -15,7 +15,7 @@ hinawa_dependency = dependency('hinawa',
hinawa_is_subproject = hinawa_dependency.type_name() != 'pkgconfig'
if hinawa_is_subproject
- hinawa_gir_dir = join_paths(meson.build_root(), 'subprojects', 'libhinawa', 'src')
+ hinawa_gir_dir = join_paths(meson.global_build_root(), 'subprojects', 'libhinawa', 'src')
endif
subdir('src')