summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-10 18:43:43 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-22 07:47:13 +0000
commitdab01380434c60e088c5c8e7416b35e867e8733f (patch)
treef015475314452b800a16479d8d3863e909daaa0a /src/sql
parent421bbefb9da3c31133833f82efafc8f29ec7e728 (diff)
make more use of 'use' in library detection
now that it works nicely, make use of it for the zlib deps, which are not transitive when the detected library is built statically. Change-Id: Iaed87a37b36f714f0b919244cd84809650102ba9 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/configure.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sql/configure.json b/src/sql/configure.json
index 4c24d1913b..45b3fd9dd1 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -114,8 +114,10 @@
"test": "unix/sqlite",
"sources": [
{ "type": "pkgConfig", "args": "sqlite3" },
- { "libs": "-lsqlite3", "condition": "config.win32" },
- { "libs": "-lsqlite3 -lz", "condition": "!config.win32" }
+ "-lsqlite3"
+ ],
+ "use": [
+ { "lib": "zlib", "condition": "!config.win32" }
]
}
},