diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2021-08-04 13:31:06 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2021-08-04 13:36:01 +0200 |
| commit | ba7406dc45942b90ec0b4d0d57d30b9548bc9b3a (patch) | |
| tree | 4d673312e67f9a250dc980d947667cda555265fc | |
| parent | 0a4ecd9974d648f379c300abdccc87f65cffce38 (diff) | |
| download | tracker-ba7406dc45942b90ec0b4d0d57d30b9548bc9b3a.tar.gz | |
libtracker-sparql: Check for the correct build CWD as subproject
When building Tracker as a subproject, the CWD at build time is still
that of the root project. We want to check this, instead of the
subproject build root.
This makes the remote module correctly detected in the build dir
when building Tracker as a subproject (as it happens in tracker-miners
CI).
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/libtracker-sparql/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index ed8fdd3ff..8364a9244 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('tracker', 'c', 'vala', version: '3.2.0.alpha.1', - meson_version: '>=0.56', + meson_version: '>=0.51', default_options: [ 'c_std=c99', 'warning_level=2']) diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build index 4f09d9657..f4365d7f3 100644 --- a/src/libtracker-sparql/meson.build +++ b/src/libtracker-sparql/meson.build @@ -156,7 +156,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version, '-include', 'libtracker-sparql/tracker-private.h', '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir), '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()), - '-DBUILDROOT="@0@"'.format(meson.project_build_root()), + '-DBUILDROOT="@0@"'.format(meson.build_root()), ], link_whole: [libtracker_sparql_intermediate], |