From 128980bb846a5dfb52f7bc0d33d9888261267768 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 5 Jun 2020 17:19:29 +0200 Subject: [PATCH] sqlite: fix qbs and cmake builds Change-Id: I64887c2dd11b8de8627976b148993467e70674e0 Reviewed-by: Marco Bubke --- src/libs/sqlite/CMakeLists.txt | 12 +++++++----- src/libs/sqlite/sqlite.qbs | 17 +++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt index 19d3dbb8a8f..0f5024b9e1f 100644 --- a/src/libs/sqlite/CMakeLists.txt +++ b/src/libs/sqlite/CMakeLists.txt @@ -1,16 +1,16 @@ add_qtc_library(Sqlite DEFINES - SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 - SQLITE_ENABLE_UNLOCK_NOTIFY SQLITE_ENABLE_JSON1 - SQLITE_DEFAULT_FOREIGN_KEYS=1 SQLITE_TEMP_STORE=2 SQLITE_DEFAULT_PAGE_SIZE=32768 + BUILD_SQLITE_LIBRARY + SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY + 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_OMIT_DEPRECATED SQLITE_OMIT_DECLTYPE SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA 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 - BUILD_SQLITE_LIBRARY + SQLITE_DEFAULT_MMAP_SIZE=268435456 SQLITE_CORE SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK + SQLITE_LIKE_DOESNT_MATCH_BLOBS DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} PUBLIC_INCLUDES "${CMAKE_CURRENT_LIST_DIR}" @@ -30,6 +30,8 @@ add_qtc_library(Sqlite sqliteindex.h sqlitereadstatement.cpp sqlitereadstatement.h sqlitereadwritestatement.cpp sqlitereadwritestatement.h + sqlitesessionchangeset.cpp sqlitesessionchangeset.h + sqlitesessions.cpp sqlitesessions.h sqlitetable.h sqlitetransaction.h sqlitewritestatement.cpp sqlitewritestatement.h diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index 35125901e27..b03ce9b975f 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -6,12 +6,16 @@ QtcLibrary { cpp.includePaths: base.concat(["../3rdparty/sqlite", "."]) cpp.defines: base.concat([ "BUILD_SQLITE_LIBRARY", - "SQLITE_THREADSAFE=2", - "SQLITE_ENABLE_FTS4", - "SQLITE_ENABLE_FTS3_PARENTHESIS", - "SQLITE_ENABLE_UNLOCK_NOTIFY", - "SQLITE_ENABLE_COLUMN_METADATA", - "SQLITE_ENABLE_JSON1" + "SQLITE_THREADSAFE=2", "SQLITE_ENABLE_FTS5", "SQLITE_ENABLE_UNLOCK_NOTIFY", + "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_OMIT_DEPRECATED", "SQLITE_OMIT_DECLTYPE", + "SQLITE_MAX_EXPR_DEPTH=0", "SQLITE_OMIT_SHARED_CACHE", "SQLITE_USE_ALLOCA", + "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.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) @@ -26,6 +30,7 @@ QtcLibrary { "sqlite3.c", "sqlite3.h", "sqlite3ext.h", + "carray.c" ] }