diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-16 11:43:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-16 11:43:06 +0000 |
| commit | cc6bb132428e66051b6624c6a92d715a3840e017 (patch) | |
| tree | 7ab72b179d8567864dc76b88c628a6d53faa5ffc | |
| parent | f279c7b1c25f4b74fc4be1814bd0a2514db8e2cf (diff) | |
| parent | 50beae7541d2f13240f7ac39bed5997fbb6eee12 (diff) | |
| download | gtk+-cc6bb132428e66051b6624c6a92d715a3840e017.tar.gz | |
Merge branch 'kjellahl/cairo-subproject' into 'master'
Fix build when cairo is a subproject
See merge request GNOME/gtk!3304
| -rw-r--r-- | gdk/x11/gdkglcontext-x11.c | 2 | ||||
| -rw-r--r-- | gsk/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index d83ef6aaad..018860bae8 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -37,7 +37,7 @@ #include "gdkintl.h" -#include <cairo/cairo-xlib.h> +#include <cairo-xlib.h> #include <epoxy/glx.h> diff --git a/gsk/meson.build b/gsk/meson.build index 8e2b0f1782..24b6be14da 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -230,5 +230,5 @@ libgsk = static_library('gsk', # "public" libgtk_dep used by internal executables. libgsk_dep = declare_dependency(include_directories: [ confinc, ], sources: [ gskenum_h, ], - dependencies: libgdk_dep, + dependencies: [libgdk_dep, cairo_csi_dep], ) |