Add the stylish subproject as a git submodule

parent 8c4d07ba
......@@ -50,6 +50,7 @@ build:
image: registry.gitlab.gnome.org/gnome/mutter/master:v3
stage: build
before_script:
- dnf install -y rust cargo rust-std-static
- .gitlab-ci/checkout-mutter.sh
- meson mutter mutter/build --prefix=/usr -Dtests=false
- ninja -C mutter/build install
......
FROM registry.fedoraproject.org/fedora:latest
RUN dnf -y update && dnf -y upgrade && \
dnf install -y 'dnf-command(copr)' git && \
dnf install -y 'dnf-command(copr)' git rust cargo rust-std-static && \
# For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
dnf install -y findutils mozjs60-devel && \
......
[submodule "subprojects/gvc"]
path = subprojects/gvc
url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
[submodule "subprojects/stylish"]
path = subprojects/stylish
url = https://gitlab.gnome.org/federico/stylish.git
......@@ -252,6 +252,17 @@ libgvc = subproject('gvc',
)
libgvc_gir = libgvc.get_variable('libgvc_gir')
libstylish = subproject(
'stylish',
default_options: [
'package_name=' + meson.project_name(),
'package_version=' + meson.project_version(),
'static=false',
]
)
libstylish_lib = libstylish.get_variable('cargo_release')
po_dir = join_paths(meson.current_source_dir(), 'po')
subdir('js')
......
......@@ -44,7 +44,7 @@ st_h = configure_file(
configuration: st_h_data
)
st_inc = include_directories('.', '..')
st_inc = include_directories('.', '..', '../../subprojects')
# please, keep this sorted alphabetically
st_private_headers = [
......@@ -163,6 +163,7 @@ custom_target('scroll-view-fade-glsl',
st_cflags = [
'-I@0@/src'.format(meson.source_root()),
'-I@0@/subprojects'.format(meson.source_root()),
'-I@0@'.format(meson.build_root()),
'-DPREFIX="@0@"'.format(prefix),
'-DLIBDIR="@0@"'.format(libdir),
......@@ -173,11 +174,15 @@ st_cflags = [
'-DPACKAGE_DATA_DIR="@0@"'.format(pkgdatadir)
]
thread_dep = dependency('threads')
libdl_dep = cc.find_library('dl')
# Currently meson requires a shared library for building girs
libst = shared_library('st-1.0',
sources: st_gir_sources + croco_sources,
c_args: st_cflags,
dependencies: [clutter_dep, gtk_dep, mutter_dep, libxml_dep, m_dep],
dependencies: [clutter_dep, gtk_dep, mutter_dep, libxml_dep, m_dep, thread_dep, libdl_dep],
link_with: [libstylish_lib],
build_rpath: mutter_typelibdir,
install_rpath: mutter_typelibdir,
install_dir: pkglibdir,
......
Subproject commit 99022c1f9d52d8c6e5de1c131c07c116ff9f0817
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment