summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2021-04-22 17:10:53 +0200
committerPranam Lashkari <lpranam@collabora.com>2021-07-07 20:23:06 +0200
commitd03ab54d94ca1d772523067a098552c2b66d6445 (patch)
treebea4594100a3babc95496cd47101afb4bb74729c /RepositoryExternal.mk
parentjsdialog: send type for popup messages (diff)
downloadcore-d03ab54d94ca1d772523067a098552c2b66d6445.tar.gz
core-d03ab54d94ca1d772523067a098552c2b66d6445.zip
fix cairocanvas build with internal cairo
3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b made cairocanvas #include also a pixman header, but the internal cairo case wasn't setting up the pixman include path. Change-Id: Ib0daab3a5ec1a6ebf1b29eb37b039d2f41f770c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114491 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118498 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5db36ebad3d0..fbd48dd2c699 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1301,6 +1301,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
+ -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\