diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-28 08:36:44 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-29 13:50:00 +0200 |
| commit | 894450d6ebbb2d5e063d72b971580d1b8c10a5e3 (patch) | |
| tree | 364b3468afcc4c9477e8153f854f95fe23ebbc9b /vcl/Library_vclplug_kf5.mk | |
| parent | 63c22a7c309a866c4580c2bf028a0d2ece9ee1c0 (diff) | |
Unify how Qt/KF build flags/libs are set
Unify the way that QT5_CFLAGS, QT5_LIBS, KF5_CFLAGS
and KF5_LIBS are set.
RepositoryExternal.mk has entries for "qt5" and "kf5",
and thus using the "qt5" and "kf5" externals sets
includes, cxxflags, defs and libs for gbuild as needed.
Use this mechanism consistently in all Makefiles
for qt5-/kf5-related libraries and executables
and drop setting flags and libs "manually".
(For several targets, like 'vcl/Library_vclplug_qt5',
flags were set both ways, i.e. they were set twice).
Change-Id: I246cffdb0bf40b7ba2d694f9b868c2b8e381aacc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122804
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/Library_vclplug_kf5.mk')
| -rw-r--r-- | vcl/Library_vclplug_kf5.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk index d10cecd167d5..bcf8fb6897ad 100644 --- a/vcl/Library_vclplug_kf5.mk +++ b/vcl/Library_vclplug_kf5.mk @@ -61,13 +61,6 @@ $(eval $(call gb_Library_use_externals,vclplug_kf5,\ epoxy \ )) -$(eval $(call gb_Library_add_cxxflags,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/KF5FilePicker \ vcl/unx/kf5/KF5SalFrame \ |