feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

sqlite: fix qbs and cmake builds

Browse Source 
Change-Id: I64887c2dd11b8de8627976b148993467e70674e0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2020-06-05 17:19:29 +02:00
parent d5b2a90bc0
commit 128980bb84
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/sqlite/CMakeLists.txt
View File

@@ -1,16 +1,16 @@
add_qtc_library(Sqlite add_qtc_library(Sqlite
DEFINES DEFINES
SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 BUILD_SQLITE_LIBRARY
SQLITE_ENABLE_UNLOCK_NOTIFY SQLITE_ENABLE_JSON1 SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY
SQLITE_DEFAULT_FOREIGN_KEYS=1 SQLITE_TEMP_STORE=2 SQLITE_DEFAULT_PAGE_SIZE=32768 SQLITE_ENABLE_JSON1 SQLITE_DEFAULT_FOREIGN_KEYS=1 SQLITE_TEMP_STORE=2
SQLITE_DEFAULT_WAL_SYNCHRONOUS=1 SQLITE_MAX_WORKER_THREADS SQLITE_DEFAULT_MEMSTATUS=0 SQLITE_DEFAULT_WAL_SYNCHRONOUS=1 SQLITE_MAX_WORKER_THREADS SQLITE_DEFAULT_MEMSTATUS=0
SQLITE_OMIT_DEPRECATED SQLITE_OMIT_DECLTYPE SQLITE_OMIT_DEPRECATED SQLITE_OMIT_DECLTYPE
SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA
SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_NULL_TRIM SQLITE_OMIT_EXPLAIN SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_NULL_TRIM SQLITE_OMIT_EXPLAIN
SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_UTF16 SQLITE_DQS=0 SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_UTF16 SQLITE_DQS=0
SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_FDATASYNC HAVE_MALLOC_USABLE_SIZE SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_FDATASYNC HAVE_MALLOC_USABLE_SIZE
SQLITE_DEFAULT_MMAP_SIZE=268435456 SQLITE_DEFAULT_MMAP_SIZE=268435456 SQLITE_CORE SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK
BUILD_SQLITE_LIBRARY SQLITE_LIKE_DOESNT_MATCH_BLOBS
DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS}
PUBLIC_INCLUDES PUBLIC_INCLUDES
"${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}"
@@ -30,6 +30,8 @@ add_qtc_library(Sqlite
sqliteindex.h sqliteindex.h
sqlitereadstatement.cpp sqlitereadstatement.h sqlitereadstatement.cpp sqlitereadstatement.h
sqlitereadwritestatement.cpp sqlitereadwritestatement.h sqlitereadwritestatement.cpp sqlitereadwritestatement.h
sqlitesessionchangeset.cpp sqlitesessionchangeset.h
sqlitesessions.cpp sqlitesessions.h
sqlitetable.h sqlitetable.h
sqlitetransaction.h sqlitetransaction.h
sqlitewritestatement.cpp sqlitewritestatement.h sqlitewritestatement.cpp sqlitewritestatement.h

17
src/libs/sqlite/sqlite.qbs
View File

@@ -6,12 +6,16 @@ QtcLibrary {
cpp.includePaths: base.concat(["../3rdparty/sqlite", "."]) cpp.includePaths: base.concat(["../3rdparty/sqlite", "."])
cpp.defines: base.concat([ cpp.defines: base.concat([
"BUILD_SQLITE_LIBRARY", "BUILD_SQLITE_LIBRARY",
"SQLITE_THREADSAFE=2", "SQLITE_THREADSAFE=2", "SQLITE_ENABLE_FTS5", "SQLITE_ENABLE_UNLOCK_NOTIFY",
"SQLITE_ENABLE_FTS4", "SQLITE_ENABLE_JSON1", "SQLITE_DEFAULT_FOREIGN_KEYS=1", "SQLITE_TEMP_STORE=2",
"SQLITE_ENABLE_FTS3_PARENTHESIS", "SQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "SQLITE_MAX_WORKER_THREADS", "SQLITE_DEFAULT_MEMSTATUS=0",
"SQLITE_ENABLE_UNLOCK_NOTIFY", "SQLITE_OMIT_DEPRECATED", "SQLITE_OMIT_DECLTYPE",
"SQLITE_ENABLE_COLUMN_METADATA", "SQLITE_MAX_EXPR_DEPTH=0", "SQLITE_OMIT_SHARED_CACHE", "SQLITE_USE_ALLOCA",
"SQLITE_ENABLE_JSON1" "SQLITE_ENABLE_MEMORY_MANAGEMENT", "SQLITE_ENABLE_NULL_TRIM", "SQLITE_OMIT_EXPLAIN",
"SQLITE_OMIT_LOAD_EXTENSION", "SQLITE_OMIT_UTF16", "SQLITE_DQS=0",
"SQLITE_ENABLE_STAT4", "HAVE_ISNAN", "HAVE_FDATASYNC", "HAVE_MALLOC_USABLE_SIZE",
"SQLITE_DEFAULT_MMAP_SIZE=268435456", "SQLITE_CORE", "SQLITE_ENABLE_SESSION", "SQLITE_ENABLE_PREUPDATE_HOOK",
"SQLITE_LIKE_DOESNT_MATCH_BLOBS"
]) ])
cpp.optimization: "fast" cpp.optimization: "fast"
cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd"))
@@ -26,6 +30,7 @@ QtcLibrary {
"sqlite3.c", "sqlite3.c",
"sqlite3.h", "sqlite3.h",
"sqlite3ext.h", "sqlite3ext.h",
"carray.c"
] ]
} }