Merge branch 'kjellahl/cairo-subproject' into 'master'

Fix build when cairo is a subproject See merge request GNOME/gtk!3304
2021-03-16 11:43:06 +00:00 · 2021-03-16 11:43:06 +00:00 · cc6bb13242
commit cc6bb13242
parent f279c7b1c2 50beae7541
2 changed files with 2 additions and 2 deletions
--- 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>

--- 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],
 )