summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/meson.build2
-rw-r--r--meson.build3
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/meson.build b/lib/meson.build
index 768ce90b5..ad9e2abef 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -178,7 +178,7 @@ endif
if get_option('srcdir') != ''
srcdir = join_paths(get_option('srcdir'), 'tests')
else
- srcdir = join_paths(meson.source_root(), 'tests')
+ srcdir = join_paths(source_root, 'tests')
endif
if get_option('version_hash') != ''
diff --git a/meson.build b/meson.build
index b896283e3..12d5113a9 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,9 @@ if get_option('b_ndebug') != 'false'
error('Building without -Db_ndebug=false is not supported')
endif
+# meson.source_root is marked as a future-deprecated feature
+source_root = meson.current_source_dir()
+
cc = meson.get_compiler('c')
# Also make sure that the user doesn't have -DNDEBUG defined in their config