updated build system
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit

This commit is contained in:
Scott E. Graves 2024-08-03 14:10:15 -05:00
parent d0e9ed4181
commit 68d79c73cf
5 changed files with 4 additions and 38 deletions

View File

@ -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

View File

@ -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)

Binary file not shown.

View File

@ -1 +0,0 @@
ae85b5545f6171694f4d7f915e8e87a936fcb1a56409e5fb3da89d52e3c224cc sqlite-3.46.0.tar.gz

View File

@ -1,7 +0,0 @@
#!/bin/bash
CFLAGS="-O3 -march=$1 -mtune=generic" ./configure \
--disable-tcl \
--enable-shared=yes \
--enable-static=yes \
--prefix="$2"