diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 12:34:24 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:18 +0000 |
| commit | 9172143f52757c29fbcf1a5f30d5ca25c52efb81 (patch) | |
| tree | 9df4e8edd2decb88eafeef5bc920bdff397acbf0 /configure.json | |
| parent | 98ddf9262e356178ddcf26b72e375c99cec16b79 (diff) | |
Add configure.exe-like FOO_LIBS=bar style command line options
Add the command line options supported by the windows version of
configure and respect them when running our configure tests.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: I1206d60a177e251540d34d232c73c930847564b3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 0d8c73a639..29cbacc89d 100644 --- a/configure.json +++ b/configure.json @@ -6,6 +6,17 @@ }, "commandline": { + "assignments": { + "DBUS_HOST_PATH": "host_dbus.prefix", + "DBUS_PATH": "dbus.prefix", + "MYSQL_PATH": "mysql.prefix", + "OPENSSL_LIBS": "openssl.libs", + "OPENSSL_PATH": "openssl.prefix", + "PSQL_LIBS": "psql.libs", + "SYBASE": "tds.prefix", + "SYBASE_LIBS": "tds.libs", + "ZLIB_LIBS": "zlib.libs" + }, "options": { "prefix": "string", "hostprefix": "string", @@ -421,7 +432,8 @@ "description": "D-Bus >= 1.2 (host)", "export": "", "sources": [ - { "type": "pkgConfig", "host": true, "args": "dbus-1 >= 1.2" } + { "type": "pkgConfig", "host": true, "args": "dbus-1 >= 1.2" }, + { "libs": "", "comment": "placeholder for DBUS_HOST_PATH" } ] }, "libinput": { @@ -2447,7 +2459,8 @@ XKB configuration data. This is required for keyboard input support." }, { "type": "note", - "condition": "features.openssl-linked && libs.openssl.source != 0", + "condition": "features.openssl-linked && libs.openssl.source != 0 + && input.openssl.prefix == '' && input.openssl.libs == ''", "message": "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: |