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 /tools/configure | |
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 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.cpp | 13 | ||||
-rw-r--r-- | tools/configure/configureapp.h | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 5da2917c94..d0db503d90 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -953,12 +953,18 @@ void Configure::parseCmdLine() opensslLibsDebug = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_RELEASE=")) { 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=")) { psqlLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("SYBASE=")) { sybase = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { 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")){ @@ -2544,7 +2550,14 @@ void Configure::generateOutputVars() } else if (opensslLibs.isEmpty()) { 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()) qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 7f4cbdb983..0ec4edebc7 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -143,6 +143,9 @@ private: QString opensslLibs; QString opensslLibsDebug; QString opensslLibsRelease; + QString opensslPath; + QString dbusPath; + QString mysqlPath; QString psqlLibs; QString sybase; QString sybaseLibs; |