1 files changed, 7 insertions, 28 deletions

diff --git a/meson.build b/meson.build
index c602d008..71e75fd9 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
         'c',
         version: '1.10-dev',
         license: 'MIT',
-        meson_version: '>=0.60.0',
+        meson_version: '>=1.3',
         default_options: [
                 'c_std=c11',
                 'warning_level=2',
@@ -38,14 +38,14 @@ if is_freebsd
 endif
 
 # Execute the wlroots subproject, if any
-wlroots_version = ['>=0.18.0', '<0.19.0']
+wlroots_version = ['>=0.19.0', '<0.20.0']
 subproject(
         'wlroots',
         default_options: ['examples=false'],
         required: false,
         version: wlroots_version,
 )
-wlroots = dependency('wlroots-0.18', version: wlroots_version, fallback: 'wlroots')
+wlroots = dependency('wlroots-0.19', version: wlroots_version, fallback: 'wlroots')
 wlroots_features = {
         'xwayland': false,
         'libinput_backend': false,
@@ -160,8 +160,8 @@ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir
 version = '"@0@"'.format(meson.project_version())
 git = find_program('git', native: true, required: false)
 if git.found()
-        git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
-        git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
+        git_commit = run_command([git, '--git-dir=.git', 'rev-parse', '--short', 'HEAD'], check: false)
+        git_branch = run_command([git, '--git-dir=.git', 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
         if git_commit.returncode() == 0 and git_branch.returncode() == 0
                 version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
                         meson.project_version(),
@@ -172,31 +172,10 @@ if git.found()
 endif
 add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
-# Compute the relative path used by compiler invocations.
-source_root = meson.current_source_dir().split('/')
-build_root = meson.global_build_root().split('/')
-relative_dir_parts = []
-i = 0
-in_prefix = true
-foreach p : build_root
-        if i >= source_root.length() or not in_prefix or p != source_root[i]
-                in_prefix = false
-                relative_dir_parts += '..'
-        endif
-        i += 1
-endforeach
-i = 0
-in_prefix = true
-foreach p : source_root
-        if i >= build_root.length() or not in_prefix or build_root[i] != p
-                in_prefix = false
-                relative_dir_parts += p
-        endif
-        i += 1
-endforeach
-relative_dir = join_paths(relative_dir_parts) + '/'
+fs = import('fs')
 
 # Strip relative path prefixes from the code if possible, otherwise hide them.
+relative_dir = fs.relative_to(meson.current_source_dir(), meson.global_build_root()) + '/'
 if cc.has_argument('-fmacro-prefix-map=/prefix/to/hide=')
         add_project_arguments(
                 '-fmacro-prefix-map=@0@='.format(relative_dir),