diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-27 10:04:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-06 12:05:31 +0100 |
| commit | 88945965d55192b3c1b3b62227d3e48f0bfd8da2 (patch) | |
| tree | 90fff9f410e19c79c7fa90c094a70afa081d5e20 /vcl/Library_vclplug_kf5.mk | |
| parent | 7cf778c4f37b5eecfc11db5d5d7e70cd8e66c748 (diff) | |
KF5 seperate Qt5 detection from KF5
Splits the configure checks into a Qt5 and KF5 specific part.
Change-Id: I0a616ba031e1f7fd0385219ac48179adb4bdaf14
Diffstat (limited to 'vcl/Library_vclplug_kf5.mk')
| -rw-r--r-- | vcl/Library_vclplug_kf5.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk index 9e993b2edb9d..416a6d53d072 100644 --- a/vcl/Library_vclplug_kf5.mk +++ b/vcl/Library_vclplug_kf5.mk @@ -59,16 +59,22 @@ $(eval $(call gb_Library_use_externals,vclplug_kf5,\ epoxy \ )) -ifneq ($(KF5_HAVE_GLIB),) +ifneq ($(QT5_HAVE_GLIB),) $(eval $(call gb_Library_add_defs,vclplug_kf5,\ - $(KF5_GLIB_CFLAGS) \ + $(QT5_GLIB_CFLAGS) \ )) - $(eval $(call gb_Library_add_libs,vclplug_kf5,\ - $(KF5_GLIB_LIBS) \ + $(QT5_GLIB_LIBS) \ )) endif +$(eval $(call gb_Library_add_defs,vclplug_kf5,\ + $(KF5_CFLAGS) \ +)) +$(eval $(call gb_Library_add_libs,vclplug_kf5,\ + $(KF5_LIBS) \ +)) + $(eval $(call gb_Library_add_exception_objects,vclplug_kf5,\ vcl/unx/kf5/Kf5Data \ vcl/unx/kf5/Kf5Frame \ |