From ba41718095a790e2a39d569f5cdd9006c5169545 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 20 May 2024 10:28:05 +0200 Subject: [PATCH] avmediagtk: Use gb_Library_set_include for GTK4_CFLAGS In the same way that `vcl/Library_vclplug_gtk4.mk` does it, set the `GTK4_CFLAGS` (which have the includes) via `gb_Library_set_include`, not `gb_Library_add_cxxflags`. This makes sure that they end up in the `INCLUDE` section in `workdir/GbuildToJson/Library/libavmediagtk.so` and thus end up in the IDE integrations as includes, which makes Qt Creator's Clang Code Model find them instead of showing an error ("gtkplayer.cxx:28:10: 'gtk/gtk.h' file not found"). See also this similar commit for more details: commit 6a53832080cf201e960113de8e1887d99e857606 Author: Michael Weghorn Date: Mon Dec 17 15:35:58 2018 +0100 Use 'gb_Library_set_include' for GTK3_CFLAGS Change-Id: I5ef01aff32073d37b8add0b2250402ccaa48b2dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167857 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- avmedia/Library_avmediagtk.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/avmedia/Library_avmediagtk.mk b/avmedia/Library_avmediagtk.mk index 08d30d3259dc..4e7fc1c50f77 100644 --- a/avmedia/Library_avmediagtk.mk +++ b/avmedia/Library_avmediagtk.mk @@ -13,16 +13,13 @@ $(eval $(call gb_Library_set_componentfile,avmediagtk,avmedia/source/gtk/avmedia $(eval $(call gb_Library_set_include,avmediagtk,\ $$(INCLUDE) \ + $$(GTK4_CFLAGS) \ -I$(SRCDIR)/avmedia/source/inc \ -I$(SRCDIR)/avmedia/source/gstreamer \ )) $(eval $(call gb_Library_use_external,avmediagtk,boost_headers)) -$(eval $(call gb_Library_add_cxxflags,avmediagtk,\ - $$(GTK4_CFLAGS) \ -)) - $(eval $(call gb_Library_use_sdk_api,avmediagtk)) $(eval $(call gb_Library_use_libraries,avmediagtk,\