FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it a fatal error if USE_SYSTEM_SQLITE=ON is set but system SQLite3 isn't found (#1095)

This commit is contained in:
Reilly Brogan 2023-09-10 13:34:26 -05:00 committed by GitHub
parent 3c6986d241
commit 481aca380e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/github-actions/build-windows.ps1
View File

@ -90,7 +90,7 @@ cd "$old_pwd"
mkdir "rssguard-build"
cd "rssguard-build"
& "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_WEBENGINE="$use_webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET"
& "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_SYSTEM_SQLITE=OFF -DUSE_WEBENGINE="$use_webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET"
& "$cmake_path" --build .
& "$cmake_path" --install . --prefix app

6
src/librssguard/CMakeLists.txt
View File

@ -521,18 +521,20 @@ list(APPEND SOURCES
# Add sqlite.
if(USE_SYSTEM_SQLITE)
find_package(SQLite3)
endif()
if(SQLite3_FOUND)
# Include directory and library are linked to below.
message(STATUS "Using system SQLite3 ${SQLite3_VERSION}.")
else()
message(STATUS "Using bundled SQLite3.")
message(FATAL_ERROR "System SQLite3 not detected. Set USE_SYSTEM_SQLITE=OFF if you want to build with bundled SQLite3.")
endif()
else()
list(APPEND SOURCES
3rd-party/sqlite/sqlite3.c
3rd-party/sqlite/sqlite3.h
)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1")
endif()
# Add SimpleCrypt.