From 755bc7a7454e257c6b86b3009d8b44926a01bcda Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 1 Dec 2021 15:02:32 +0800 Subject: [PATCH] integrate sqlite --- CMakeLists.txt | 5 +++++ cmake/cmake.options | 6 ++++++ cmake/sqlite_CMakeLists.txt.in | 6 +++--- deps/CMakeLists.txt | 9 +++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e47b8c24a..a9450220a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,11 @@ if(${BUILD_WITH_BDB}) cat("${CMAKE_SUPPORT_DIR}/bdb_CMakeLists.txt.in" ${DEPS_TMP_FILE}) endif(${BUILD_WITH_DBD}) +## sqlite +if(${BUILD_WITH_SQLITE}) + cat("${CMAKE_SUPPORT_DIR}/sqlite_CMakeLists.txt.in" ${DEPS_TMP_FILE}) +endif(${BUILD_WITH_SQLITE}) + ## lucene if(${BUILD_WITH_LUCENE}) cat("${CMAKE_SUPPORT_DIR}/lucene_CMakeLists.txt.in" ${DEPS_TMP_FILE}) diff --git a/cmake/cmake.options b/cmake/cmake.options index 0a92d693e6..c8d6e33c1a 100644 --- a/cmake/cmake.options +++ b/cmake/cmake.options @@ -19,6 +19,12 @@ option( ON ) +option( + BUILD_WITH_SQLITE + "If build with sqlite" + ON +) + option( BUILD_WITH_BDB "If build with BerkleyDB" diff --git a/cmake/sqlite_CMakeLists.txt.in b/cmake/sqlite_CMakeLists.txt.in index 912e3e8805..6fd981aeff 100644 --- a/cmake/sqlite_CMakeLists.txt.in +++ b/cmake/sqlite_CMakeLists.txt.in @@ -2,12 +2,12 @@ # sqlite ExternalProject_Add(sqlite GIT_REPOSITORY https://github.com/sqlite/sqlite.git - GIT_TAG version-3.37.0 + GIT_TAG version-3.36.0 SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/sqlite" BINARY_DIR "${CMAKE_SOURCE_DIR}/deps/sqlite" #BUILD_IN_SOURCE TRUE - CONFIGURE_COMMAND "" - BUILD_COMMAND "" + CONFIGURE_COMMAND "./configure" + BUILD_COMMAND "$(MAKE)" INSTALL_COMMAND "" TEST_COMMAND "" ) \ No newline at end of file diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 2166c79c18..00a6791b33 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -89,6 +89,15 @@ if(${BUILD_WITH_BDB}) ) endif(${BUILD_WITH_BDB}) +# SQLite +if(${BUILD_WITH_SQLITE}) + add_library(sqlite STATIC IMPORTED) + set_target_properties(bdb PROPERTIES + IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/sqlite/.lib/libsqlite3.a" + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/sqlite" + ) +endif(${BUILD_WITH_SQLITE}) + # ================================================================================================ -- GitLab