diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index e6e06941c..09118d622 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -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 diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt index 01fb0573d..396ceee04 100644 --- a/src/librssguard/CMakeLists.txt +++ b/src/librssguard/CMakeLists.txt @@ -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}.") + if(SQLite3_FOUND) + # Include directory and library are linked to below. + message(STATUS "Using system SQLite3 ${SQLite3_VERSION}.") + else() + message(FATAL_ERROR "System SQLite3 not detected. Set USE_SYSTEM_SQLITE=OFF if you want to build with bundled SQLite3.") + endif() + else() - message(STATUS "Using bundled SQLite3.") - 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.