diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2018-12-17 15:35:58 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-17 18:22:31 +0100 |
| commit | 6a53832080cf201e960113de8e1887d99e857606 (patch) | |
| tree | 455a330656044450638ac7ec86f76e656f86e12b /vcl/Library_vclplug_gtk3.mk | |
| parent | 4f89c98d715592be42d8d378786d79eb27acadcb (diff) | |
Use 'gb_Library_set_include' for GTK3_CFLAGS
This among others makes sure that the '-I'/'-isystem' compiler
flags for the gtk3 includes end up in the 'INCLUDE' section
in 'workdir/GbuildToJson/Library/libvclplug_gtk3lo.so' when
that file is generated by 'gbuildtojson'.
That file is used by 'gbuild-to-ide' to generate IDE-specific
config files.
Having the gtk3 headers in the 'INCLUDE' section makes sure that
the includes are properly taken into account when generating
the IDE-specific files, and the included files can thus
actually be found.
Also, there's no need to set '$$(INCLUDE)' via
'gb_Library_add_cxxflags', since the flags are already set via
'gb_Library_set_include', so drop the 'gb_Library_add_cxxflags'
part altogether.
Change-Id: Ibf198be9372ce2bec4c8a16d8530edf860733a57
Reviewed-on: https://gerrit.libreoffice.org/65207
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'vcl/Library_vclplug_gtk3.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 999eac743a9e..cfb2f1b2d30b 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -27,16 +27,12 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3, \ $(eval $(call gb_Library_set_include,vclplug_gtk3,\ $$(INCLUDE) \ + $$(GTK3_CFLAGS) \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/unx \ -I$(SRCDIR)/vcl/unx/gtk3 \ )) -$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ - $$(INCLUDE) \ - $$(GTK3_CFLAGS) \ -)) - $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DVCLPLUG_GTK_IMPLEMENTATION \ )) |