diff --git a/cmake/libraries/sqlite.cmake b/cmake/libraries/sqlite.cmake index 87ceb82d..8f50f499 100644 --- a/cmake/libraries/sqlite.cmake +++ b/cmake/libraries/sqlite.cmake @@ -1,38 +1,13 @@ if(PROJECT_ENABLE_SQLITE) if(PROJECT_BUILD) add_definitions(-DPROJECT_ENABLE_SQLITE) + set(SQLITE_SYSTEM_ROOT ${PROJECT_BUILD_DIR}/external/src/sqlite_project) - if(PROJECT_BUILD_SHARED_LIBS AND NOT PROJECT_IS_MINGW) - find_package(SQLite3 REQUIRED ${SQLITE_VERSION2}) + include_directories(SYSTEM BEFORE ${SQLITE_SYSTEM_ROOT}) - include_directories(${SQLite3_INCLUDE_DIRS}) - link_libraries(SQLite::SQLite3) - else() - set(SQLITE_SYSTEM_ROOT ${PROJECT_BUILD_DIR}/external/src/sqlite_project) - - include_directories(SYSTEM BEFORE - ${SQLITE_SYSTEM_ROOT} - ) - - list(APPEND PROJECT_ADDITIONAL_SOURCES - ${SQLITE_SYSTEM_ROOT}/sqlite3.c - ) - endif() - elseif(PROJECT_BUILD_SHARED_LIBS AND NOT PROJECT_IS_MINGW) - ExternalProject_Add(sqlite_project - PREFIX external - URL ${PROJECT_3RD_PARTY_DIR}/sqlite-${SQLITE_VERSION2}.tar.gz - URL_HASH SHA256=ae85b5545f6171694f4d7f915e8e87a936fcb1a56409e5fb3da89d52e3c224cc - BUILD_IN_SOURCE 1 - LIST_SEPARATOR | - CONFIGURE_COMMAND ${PROJECT_3RD_PARTY_DIR}/sqlite_configure.sh - ${PROJECT_MARCH} - ${PROJECT_EXTERNAL_BUILD_ROOT} - BUILD_COMMAND make -j1 - INSTALL_COMMAND make install + list(APPEND PROJECT_ADDITIONAL_SOURCES + ${SQLITE_SYSTEM_ROOT}/sqlite3.c ) - - list(APPEND PROJECT_DEPENDENCIES sqlite_project) else() ExternalProject_Add(sqlite_project PREFIX external diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 4ddd5cfb..8e98987a 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -40,7 +40,6 @@ set(SECP256K1_VERSION 0.1.0.20) set(SFML_VERSION 2.6.1) set(SPDLOG_VERSION 1.14.1) set(SQLITE_VERSION 3460000) -set(SQLITE_VERSION2 3.46.0) set(STDUUID_VERSION 1.2.3) set(VORBIS_VERSION 1.3.7) set(WXWIDGETS_VERSION 3.2.5) diff --git a/support/3rd_party/sqlite-3.46.0.tar.gz b/support/3rd_party/sqlite-3.46.0.tar.gz deleted file mode 100644 index 171c023e..00000000 Binary files a/support/3rd_party/sqlite-3.46.0.tar.gz and /dev/null differ diff --git a/support/3rd_party/sqlite-3.46.0.tar.gz.sha256 b/support/3rd_party/sqlite-3.46.0.tar.gz.sha256 deleted file mode 100644 index 6793cc02..00000000 --- a/support/3rd_party/sqlite-3.46.0.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -ae85b5545f6171694f4d7f915e8e87a936fcb1a56409e5fb3da89d52e3c224cc sqlite-3.46.0.tar.gz diff --git a/support/3rd_party/sqlite_configure.sh b/support/3rd_party/sqlite_configure.sh deleted file mode 100755 index 9a7f53f4..00000000 --- a/support/3rd_party/sqlite_configure.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -CFLAGS="-O3 -march=$1 -mtune=generic" ./configure \ - --disable-tcl \ - --enable-shared=yes \ - --enable-static=yes \ - --prefix="$2"