From 38014df24d96c40b5dd2f28a2bf81dbcd9cd4f94 Mon Sep 17 00:00:00 2001 From: Cerri Date: Mon, 18 Jul 2016 15:15:29 +0200 Subject: [PATCH] Provides the ability to define SQLITE3SRCDIR The sources of SQLITE3 will be compiled instead of to use the system libraries. --- Source/WebCore/PlatformQt.cmake | 19 +++++++++++++++++-- Source/cmake/OptionsQt.cmake | 7 ++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake index 845813acaaf1f..78658189b3f31 100644 --- a/Source/WebCore/PlatformQt.cmake +++ b/Source/WebCore/PlatformQt.cmake @@ -147,6 +147,23 @@ list(APPEND WebCore_SOURCES platform/text/qt/TextBreakIteratorInternalICUQt.cpp ) +if (SQLITE3SRCDIR) + list(APPEND WebCore_INCLUDE_DIRECTORIES + "${SQLITE3SRCDIR}" + ) + list(APPEND WebCore_SOURCES + "${SQLITE3SRCDIR}/sqlite3.c" + ) + add_definitions(-DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE) +else() + list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES + ${SQLITE_INCLUDE_DIR} + ) + list(APPEND WebCore_LIBRARIES + ${SQLITE_LIBRARIES} + ) +endif() + if (ENABLE_DEVICE_ORIENTATION) list(APPEND WebCore_SOURCES platform/qt/DeviceMotionClientQt.cpp @@ -193,7 +210,6 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES ${Qt5Network_INCLUDE_DIRS} ${Qt5Sensors_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -206,7 +222,6 @@ list(APPEND WebCore_LIBRARIES ${Qt5Network_LIBRARIES} ${Qt5Sensors_LIBRARIES} ${Qt5Sql_LIBRARIES} - ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ) diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 490dc6c987490..43b97f99988e9 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -172,7 +172,12 @@ endif () find_package(LibXml2 2.8.0 REQUIRED) find_package(JPEG REQUIRED) find_package(PNG REQUIRED) -find_package(Sqlite REQUIRED) +if ((NOT SQLITE3SRCDIR) OR (NOT EXISTS ${SQLITE3SRCDIR}/sqlite3.c)) + if (SQLITE3SRCDIR) + unset(SQLITE3SRCDIR) + endif() + find_package(Sqlite REQUIRED) +endif() find_package(ZLIB REQUIRED) find_package(Threads REQUIRED)