1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add possibility to add OpenSSL, DBUS, MySQL path under Windows

Browse Source 
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>
This commit is contained in:
Andreas Holzammer 2012-08-06 20:34:34 +02:00 committed by Qt by Nokia
parent bd7331cb33
commit 0ef4bf1c1e
7 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dbus/dbus.pro
View File

@ -5,6 +5,11 @@ QT = core-private
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
MODULE_CONFIG = dbusadaptors dbusinterfaces MODULE_CONFIG = dbusadaptors dbusinterfaces
!isEmpty(DBUS_PATH) {
INCLUDEPATH += $$DBUS_PATH/include
QMAKE_LIBDIR += $$DBUS_PATH/lib
}
DEFINES += DBUS_API_SUBJECT_TO_CHANGE DEFINES += DBUS_API_SUBJECT_TO_CHANGE
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
contains(QT_CONFIG, dbus-linked) { contains(QT_CONFIG, dbus-linked) {

5
src/network/ssl/ssl.pri
View File

@ -41,4 +41,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
LIBS_PRIVATE += $$OPENSSL_LIBS LIBS_PRIVATE += $$OPENSSL_LIBS
windows:LIBS += -lcrypt32 windows:LIBS += -lcrypt32
!isEmpty(OPENSSL_PATH) {
INCLUDEPATH += $$OPENSSL_PATH/include
QMAKE_LIBDIR += $$OPENSSL_PATH/lib
}
} }

5
src/sql/drivers/mysql/qsql_mysql.pri
View File

@ -1,6 +1,11 @@
HEADERS += $$PWD/qsql_mysql.h HEADERS += $$PWD/qsql_mysql.h
SOURCES += $$PWD/qsql_mysql.cpp SOURCES += $$PWD/qsql_mysql.cpp
!isEmpty(MYSQL_PATH) {
INCLUDEPATH += $$MYSQL_PATH/include
QMAKE_LIBDIR += $$MYSQL_PATH/lib
}
unix { unix {
isEmpty(QT_LFLAGS_MYSQL) { isEmpty(QT_LFLAGS_MYSQL) {
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {

2
src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
View File

@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \
$$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
$$QT_SOURCE_TREE/src/dbus $$QT_SOURCE_TREE/src/dbus
!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
SOURCES += qdbuscpp2xml.cpp \ SOURCES += qdbuscpp2xml.cpp \

2
src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
View File

@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \
$$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
$$QT_SOURCE_TREE/src/dbus $$QT_SOURCE_TREE/src/dbus
!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
SOURCES = qdbusxml2cpp.cpp \ SOURCES = qdbusxml2cpp.cpp \

13
tools/configure/configureapp.cpp
View File

@ -953,12 +953,18 @@ void Configure::parseCmdLine()
opensslLibsDebug = configCmdLine.at(i); opensslLibsDebug = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_RELEASE=")) { } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_RELEASE=")) {
opensslLibsRelease = configCmdLine.at(i); opensslLibsRelease = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("OPENSSL_PATH=")) {
opensslPath = QDir::fromNativeSeparators(configCmdLine.at(i));
} else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) {
psqlLibs = configCmdLine.at(i); psqlLibs = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("SYBASE=")) { } else if (configCmdLine.at(i).startsWith("SYBASE=")) {
sybase = configCmdLine.at(i); sybase = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) {
sybaseLibs = configCmdLine.at(i); sybaseLibs = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("DBUS_PATH=")) {
dbusPath = QDir::fromNativeSeparators(configCmdLine.at(i));
} else if (configCmdLine.at(i).startsWith("MYSQL_PATH=")) {
mysqlPath = QDir::fromNativeSeparators(configCmdLine.at(i));
} }
else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
@ -2544,7 +2550,14 @@ void Configure::generateOutputVars()
} else if (opensslLibs.isEmpty()) { } else if (opensslLibs.isEmpty()) {
qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32"); qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32");
} }
if (!opensslPath.isEmpty())
qmakeVars += opensslPath;
} }
if (dictionary[ "DBUS" ] != "no" && !dbusPath.isEmpty())
qmakeVars += dbusPath;
if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty())
qmakeVars += mysqlPath;
if (!psqlLibs.isEmpty()) if (!psqlLibs.isEmpty())
qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);

3
tools/configure/configureapp.h
View File

@ -143,6 +143,9 @@ private:
QString opensslLibs; QString opensslLibs;
QString opensslLibsDebug; QString opensslLibsDebug;
QString opensslLibsRelease; QString opensslLibsRelease;
QString opensslPath;
QString dbusPath;
QString mysqlPath;
QString psqlLibs; QString psqlLibs;
QString sybase; QString sybase;
QString sybaseLibs; QString sybaseLibs;