summaryrefslogtreecommitdiffstats
path: root/src/dbus/dbus.pro
diff options
context:
space:
mode:
authorMatt Fischer <matt.fischer@garmin.com>2013-04-08 17:07:13 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-10 19:39:53 +0200
commitd37dc75116aeb55971ab44c84e8f10ed18b8a5aa (patch)
tree33d1f5a1374e5e15201be2009b21f6b528e022d9 /src/dbus/dbus.pro
parentcd2a51a66f52767c20e80361033c573651b3a08d (diff)
Improve support for <MODULE>_PATH options
Several modules, including DBus, MySQL, and OpenSSL have configure options of the form <MODULE>_PATH, which is used on Windows (where pkg-config is not present) to specify the locations of third-party libraries. These switches had been implemented by adding extra variables which were referenced in .pro files, to add the appropriate compiler and linker switches. This is undesirable because it means there are two independent paths for adding the switches to the build, which can get out of sync with each other, and indeed this had happened for some of the DBus tools. To remedy the situation, all three of the switches were reworked so that they added values directly to the principal variables that are used in the project files. This reduces maintenance, by ensuring that the pkg-config and non-pkg-config paths appear the same to the rest of the build system. Change-Id: Iae342f1d14b79fbcfef9fe38aadc803ad3141799 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/dbus/dbus.pro')
-rw-r--r--src/dbus/dbus.pro4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 2e4119ba93..c5afe8c4d2 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -3,9 +3,7 @@ QT = core-private
CONFIG += link_pkgconfig
MODULE_CONFIG = dbusadaptors dbusinterfaces
-!isEmpty(DBUS_PATH) {
- INCLUDEPATH += $$DBUS_PATH/include
- QMAKE_LIBDIR += $$DBUS_PATH/lib
+!contains(QT_LIBS_DBUS, .*dbus-1.*) {
win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
else:QT_LIBS_DBUS += -ldbus-1
}