diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-06 20:34:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 18:55:43 +0200 |
| commit | 0ef4bf1c1e77d4b11f5f17babdd0065723901a7d (patch) | |
| tree | 46a2f532921aef6991a912842ca4d418c4fa1a72 /src | |
| parent | bd7331cb3358087d9d3f787d39ce7aff5335d8c5 (diff) | |
Add possibility to add OpenSSL, DBUS, MySQL path under Windows
Under Windows it's quite possible that OpenSSL, DBUS or MySQL is
not installed into a central place. If -I and -L is
passed at configure time, it is added to all targets,
and if that path contained a conflicting header things would go
wrong.
Change-Id: Ic3338c49aa6eaa91b3abf5341e709ef604bf7aab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/dbus.pro | 5 | ||||
| -rw-r--r-- | src/network/ssl/ssl.pri | 5 | ||||
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.pri | 5 | ||||
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 | ||||
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 |
5 files changed, 19 insertions, 0 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 2aae1f41355..cfc9768d613 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -5,6 +5,11 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces +!isEmpty(DBUS_PATH) { + INCLUDEPATH += $$DBUS_PATH/include + QMAKE_LIBDIR += $$DBUS_PATH/lib +} + DEFINES += DBUS_API_SUBJECT_TO_CHANGE QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 517e7d541ab..8ebb4b29af2 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -41,4 +41,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { LIBS_PRIVATE += $$OPENSSL_LIBS windows:LIBS += -lcrypt32 + + !isEmpty(OPENSSL_PATH) { + INCLUDEPATH += $$OPENSSL_PATH/include + QMAKE_LIBDIR += $$OPENSSL_PATH/lib + } } diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri index 1b9c3dd8ca9..c9ec2575faf 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -1,6 +1,11 @@ HEADERS += $$PWD/qsql_mysql.h SOURCES += $$PWD/qsql_mysql.cpp +!isEmpty(MYSQL_PATH) { + INCLUDEPATH += $$MYSQL_PATH/include + QMAKE_LIBDIR += $$MYSQL_PATH/lib +} + unix { isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 6dc6699b9bd..0fee3efbe4a 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus +!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include + QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS SOURCES += qdbuscpp2xml.cpp \ diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index aebdef50add..1d5c4d2fc39 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus +!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include + QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS SOURCES = qdbusxml2cpp.cpp \ |