build: Add gvdb dependency
This library is not shipped standalone and is meant to be used through subprojects. Add a Meson wrap file for it. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3825>
This commit is contained in:
parent
8caa2db139
commit
837b37170a
5 changed files with 15 additions and 1 deletions
|
@ -530,9 +530,11 @@ build-wayland-only@x86_64:
|
||||||
- pushd build
|
- pushd build
|
||||||
- gcovr --root=..
|
- gcovr --root=..
|
||||||
--filter='\.\./src/'
|
--filter='\.\./src/'
|
||||||
|
--filter='\.\./subprojects/'
|
||||||
--filter='\.\./clutter/'
|
--filter='\.\./clutter/'
|
||||||
--filter='\.\./cogl/'
|
--filter='\.\./cogl/'
|
||||||
--filter='\.\./mtk/'
|
--filter='\.\./mtk/'
|
||||||
|
--gcov-ignore-errors=no_working_dir_found
|
||||||
--exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
|
--exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
|
||||||
--json --output=../coverage-${CI_JOB_NAME}.json
|
--json --output=../coverage-${CI_JOB_NAME}.json
|
||||||
- popd
|
- popd
|
||||||
|
@ -557,6 +559,7 @@ build-wayland-only@x86_64:
|
||||||
-C build
|
-C build
|
||||||
--setup plain
|
--setup plain
|
||||||
--no-suite 'mutter/kvm'
|
--no-suite 'mutter/kvm'
|
||||||
|
--no-suite 'gvdb'
|
||||||
--no-rebuild
|
--no-rebuild
|
||||||
--timeout-multiplier 10
|
--timeout-multiplier 10
|
||||||
--print-errorlogs
|
--print-errorlogs
|
||||||
|
@ -721,7 +724,7 @@ dist-mutter:
|
||||||
- mkdir -m 1777 /tmp/.X11-unix
|
- mkdir -m 1777 /tmp/.X11-unix
|
||||||
- ./src/tests/meta-dbus-runner.py
|
- ./src/tests/meta-dbus-runner.py
|
||||||
--
|
--
|
||||||
meson dist -C build
|
meson dist -C build --include-subprojects
|
||||||
artifacts:
|
artifacts:
|
||||||
expire_in: 7 day
|
expire_in: 7 day
|
||||||
name: "mutter-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
|
name: "mutter-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
|
||||||
|
|
|
@ -129,6 +129,7 @@ lcms2_dep = dependency('lcms2', version: lcms2_req)
|
||||||
harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req)
|
harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req)
|
||||||
libeis_dep = dependency('libeis-1.0', version: libei_req)
|
libeis_dep = dependency('libeis-1.0', version: libei_req)
|
||||||
libei_dep = dependency('libei-1.0', version: libei_req)
|
libei_dep = dependency('libei-1.0', version: libei_req)
|
||||||
|
gvdb_dep = dependency('gvdb')
|
||||||
|
|
||||||
have_wayland = get_option('wayland')
|
have_wayland = get_option('wayland')
|
||||||
have_x11 = get_option('x11')
|
have_x11 = get_option('x11')
|
||||||
|
|
|
@ -1232,6 +1232,7 @@ libmutter = shared_library(libmutter_name,
|
||||||
libmutter_cogl_dep,
|
libmutter_cogl_dep,
|
||||||
libmutter_clutter_dep,
|
libmutter_clutter_dep,
|
||||||
mutter_deps,
|
mutter_deps,
|
||||||
|
gvdb_dep,
|
||||||
],
|
],
|
||||||
install_rpath: pkglibdir,
|
install_rpath: pkglibdir,
|
||||||
install_dir: libdir,
|
install_dir: libdir,
|
||||||
|
|
|
@ -48,6 +48,7 @@ tests_deps = [
|
||||||
mutter_deps,
|
mutter_deps,
|
||||||
locally_compiled_schemas_dep,
|
locally_compiled_schemas_dep,
|
||||||
wayland_client_dep,
|
wayland_client_dep,
|
||||||
|
gvdb_dep,
|
||||||
]
|
]
|
||||||
|
|
||||||
libmutter_test = shared_library(libmutter_test_name,
|
libmutter_test = shared_library(libmutter_test_name,
|
||||||
|
|
8
subprojects/gvdb.wrap
Normal file
8
subprojects/gvdb.wrap
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
[wrap-git]
|
||||||
|
directory = gvdb
|
||||||
|
url = https://gitlab.gnome.org/GNOME/gvdb.git
|
||||||
|
revision = b54bc5da25127ef416858a3ad92e57159ff565b3
|
||||||
|
depth = 1
|
||||||
|
|
||||||
|
[provide]
|
||||||
|
dependency_names = gvdb
|
Loading…
Reference in a new issue