From caebfc6293e959bc5e93289088618ee7151931f2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 15 Dec 2015 23:23:15 +0200 Subject: [PATCH] build sqlite drivers with bundled sqlite3 if not found on the system Signed-off-by: Ivailo Monev --- src/sql/CMakeLists.txt | 2 +- src/sql/drivers/sqlite/sqlite.cmake | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index cba117e12..4bbd5e280 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -49,7 +49,7 @@ endif() if(WITH_PSQL AND PostgreSQL_FOUND) include(drivers/psql/psql.cmake) endif() -if(WITH_SQLITE AND SQLITE_FOUND) +if(WITH_SQLITE OR SQLITE_FOUND) include(drivers/sqlite/sqlite.cmake) endif() include(models/models.cmake) diff --git a/src/sql/drivers/sqlite/sqlite.cmake b/src/sql/drivers/sqlite/sqlite.cmake index 22fc6397c..f843c086f 100644 --- a/src/sql/drivers/sqlite/sqlite.cmake +++ b/src/sql/drivers/sqlite/sqlite.cmake @@ -9,13 +9,25 @@ set(SQLDRIVER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/drivers/sqlite/qsql_sqlite.cpp ) -include_directories(${SQLITE_INCLUDE_DIRS}) +if(SQLITE_FOUND) + include_directories(${SQLITE_INCLUDE_DIRS}) +else() + set(SQLDRIVER_SOURCES + ${SQLDRIVER_SOURCES} + ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3/sqlite3.c + ) + include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3) +endif() katie_resources("${SQLDRIVER_SOURCES}") katie_resources("${SQLDRIVER_HEADERS}") add_library(qsqlite ${KATIE_TYPE} ${SQLDRIVER_SOURCES} ${SQLDRIVER_HEADERS}) -target_link_libraries(qsqlite KtSql ${SQLITE_LIBRARIES}) +if(SQLITE_FOUND) + target_link_libraries(qsqlite KtSql ${SQLITE_LIBRARIES}) +else() + target_link_libraries(qsqlite KtSql) +endif() install( TARGETS qsqlite -- 2.11.0