diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-10 13:50:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-10 13:50:58 +0200 |
| commit | 6bb918adabea7b1ba38344efc9b4eb9ad5335bc5 (patch) | |
| tree | fc5f9e42dda70d49b304d3463812cb75ece959da /qbs | |
| parent | 771f1ef6d6dc56ff2fbb583086ef6f1187e5edc6 (diff) | |
| parent | c4605ebc07685b7bb93cc668e41adfb1fc3968ab (diff) | |
| download | qt-creator-6bb918adabea7b1ba38344efc9b4eb9ad5335bc5.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/sqlite_sources/sqlite-sources.qbs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/qbs/modules/sqlite_sources/sqlite-sources.qbs b/qbs/modules/sqlite_sources/sqlite-sources.qbs index ea80e58b1b..67e547bbeb 100644 --- a/qbs/modules/sqlite_sources/sqlite-sources.qbs +++ b/qbs/modules/sqlite_sources/sqlite-sources.qbs @@ -8,9 +8,18 @@ Module { Depends { name: "cpp" } - cpp.defines: [ - "_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE" - ].concat(buildSharedLib ? "BUILD_SQLITE_LIBRARY" : "BUILD_SQLITE_STATIC_LIBRARY") + cpp.defines: { + var defines = ["_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE"]; + if (buildSharedLib) + defines.push("BUILD_SQLITE_LIBRARY"); + else + defines.push("BUILD_SQLITE_STATIC_LIBRARY"); + if (qbs.targetOS.contains("linux")) + defines.push("_POSIX_C_SOURCE=200809L", "_GNU_SOURCE"); + else if (qbs.targetOS.contains("macos")) + defines.push("_BSD_SOURCE"); + return defines; + } cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) ? ["dl", "pthread"] : []) @@ -31,10 +40,12 @@ Module { prefix: sqlite_sources.sqliteDir3rdParty + '/' cpp.warningLevel: "none" files: [ + "carray.c", + "config.h", "sqlite3.c", "sqlite3.h", + "sqlite.h", "sqlite3ext.h", - "carray.c" ] } } |