[epiphany/mcatanzaro/meson-warnings: 4/4] build: use project_source_root(), project_build_root()
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/meson-warnings: 4/4] build: use project_source_root(), project_build_root()
- Date: Fri, 5 Aug 2022 20:41:05 +0000 (UTC)
commit 9f673c16b0ee0c9c18cf399bd24e4a6ac4f30a9e
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Fri Aug 5 15:39:13 2022 -0500
build: use project_source_root(), project_build_root()
Meson complains the older versions are deprecated.
data/meson.build | 2 +-
meson.build | 4 ++--
tests/meson.build | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 3108a0060..9563c8767 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = join_paths(meson.project_source_root(), 'po')
icondir = join_paths('icons', 'hicolor', 'scalable', 'apps')
install_data(
diff --git a/meson.build b/meson.build
index ca96c9bf8..9c651e674 100644
--- a/meson.build
+++ b/meson.build
@@ -41,7 +41,7 @@ endif
conf = configuration_data()
conf.set_quoted('APPLICATION_ID', application_id)
-conf.set_quoted('BUILD_ROOT', meson.build_root())
+conf.set_quoted('BUILD_ROOT', meson.project_build_root())
developer_mode = get_option('developer_mode')
conf.set10('DEVELOPER_MODE', developer_mode)
conf.set_quoted('DISTRIBUTOR_NAME', distributor_name)
@@ -52,7 +52,7 @@ conf.set_quoted('LIBLOCALEDIR', liblocaledir)
conf.set_quoted('LOCALEDIR', localedir)
conf.set_quoted('PKGLIBEXECDIR', pkglibexecdir)
conf.set_quoted('PROFILE', profile)
-conf.set_quoted('SOURCE_ROOT', meson.source_root())
+conf.set_quoted('SOURCE_ROOT', meson.project_source_root())
tech_preview = get_option('tech_preview')
conf.set10('TECH_PREVIEW', tech_preview)
conf.set_quoted('G_LOG_DOMAIN', 'epiphany')
diff --git a/tests/meson.build b/tests/meson.build
index 7d474497a..d090af737 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,9 +1,9 @@
envs = [
'G_TEST_SRCDIR=' + meson.current_source_dir(),
'G_TEST_BUILDDIR=' + meson.current_build_dir(),
- 'GSETTINGS_SCHEMA_DIR=' + join_paths(meson.build_root(), 'data'),
+ 'GSETTINGS_SCHEMA_DIR=' + join_paths(meson.project_build_root(), 'data'),
'GSETTINGS_BACKEND=memory',
- 'PATH=' + join_paths(meson.build_root(), 'src') + ':' + run_command('printenv', 'PATH', check:
true).stdout(),
+ 'PATH=' + join_paths(meson.project_build_root(), 'src') + ':' + run_command('printenv', 'PATH', check:
true).stdout(),
]
test_cargs = ['-UG_DISABLE_ASSERT']
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]