FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build fix

Browse Source
This commit is contained in:
Martin Rotter 2024-03-19 08:45:45 +01:00 committed by martinrotter
parent f460ad667c
commit 446965cae8
7 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librssguard-standard/CMakeLists.txt
View File

@ -106,6 +106,22 @@ if(QT_VERSION_MAJOR EQUAL 6)
) )
endif() endif()
if(ZLIB_FOUND)
target_include_directories(rssguard-standard AFTER
PRIVATE
${ZLIB_INCLUDE_DIRS}
)
target_compile_definitions(rssguard-standard
PRIVATE
ENABLE_COMPRESSED_SITEMAP
)
target_link_libraries(rssguard-standard PRIVATE
${ZLIB_LIBRARIES}
)
endif(ZLIB_FOUND)
if(WIN32 OR OS2) if(WIN32 OR OS2)
install(TARGETS rssguard-standard DESTINATION plugins) install(TARGETS rssguard-standard DESTINATION plugins)
elseif(UNIX AND NOT APPLE AND NOT ANDROID) elseif(UNIX AND NOT APPLE AND NOT ANDROID)

4
src/librssguard-standard/src/parsers/sitemapparser.cpp
View File

@ -3,15 +3,15 @@
#include "src/parsers/sitemapparser.h" #include "src/parsers/sitemapparser.h"
#if defined(ENABLE_COMPRESSED_SITEMAP) #if defined(ENABLE_COMPRESSED_SITEMAP)
#include <librssguard/3rd-party/qcompressor/qcompressor.h> #include "src/3rd-party/qcompressor/qcompressor.h"
#endif #endif
#include "src/definitions.h"
#include <librssguard/definitions/definitions.h> #include <librssguard/definitions/definitions.h>
#include <librssguard/exceptions/applicationexception.h> #include <librssguard/exceptions/applicationexception.h>
#include <librssguard/exceptions/feedrecognizedbutfailedexception.h> #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>
#include <librssguard/miscellaneous/settings.h> #include <librssguard/miscellaneous/settings.h>
#include <librssguard/miscellaneous/textfactory.h> #include <librssguard/miscellaneous/textfactory.h>
#include "src/definitions.h"
#include <QDomDocument> #include <QDomDocument>
#include <QTextCodec> #include <QTextCodec>

6
src/librssguard-standard/src/standardfeed.cpp
View File

@ -2,6 +2,8 @@
#include "src/standardfeed.h" #include "src/standardfeed.h"
#include "src/gui/formstandardfeeddetails.h"
#include "src/standardserviceroot.h"
#include <librssguard/database/databasequeries.h> #include <librssguard/database/databasequeries.h>
#include <librssguard/definitions/definitions.h> #include <librssguard/definitions/definitions.h>
#include <librssguard/exceptions/applicationexception.h> #include <librssguard/exceptions/applicationexception.h>
@ -10,8 +12,6 @@
#include <librssguard/exceptions/scriptexception.h> #include <librssguard/exceptions/scriptexception.h>
#include <librssguard/miscellaneous/settings.h> #include <librssguard/miscellaneous/settings.h>
#include <librssguard/miscellaneous/textfactory.h> #include <librssguard/miscellaneous/textfactory.h>
#include "src/gui/formstandardfeeddetails.h"
#include "src/standardserviceroot.h"
#if defined(NO_LITE) #if defined(NO_LITE)
#include <librssguard/gui/webviewers/webengine/webengineviewer.h> #include <librssguard/gui/webviewers/webengine/webengineviewer.h>
@ -26,7 +26,7 @@
#include "src/parsers/sitemapparser.h" #include "src/parsers/sitemapparser.h"
#if defined(ENABLE_COMPRESSED_SITEMAP) #if defined(ENABLE_COMPRESSED_SITEMAP)
#include <librssguard/3rd-party/qcompressor/qcompressor.h> #include "src/3rd-party/qcompressor/qcompressor.h"
#endif #endif
#include <QCommandLineParser> #include <QCommandLineParser>

4
src/librssguard-standard/src/standardserviceentrypoint.cpp
View File

@ -10,9 +10,7 @@
StandardServiceEntryPoint::StandardServiceEntryPoint(QObject* parent) : QObject(parent) {} StandardServiceEntryPoint::StandardServiceEntryPoint(QObject* parent) : QObject(parent) {}
StandardServiceEntryPoint::~StandardServiceEntryPoint() { StandardServiceEntryPoint::~StandardServiceEntryPoint() {}
qDebugNN << LOGSEC_CORE << "Destructing plugin.";
}
QString StandardServiceEntryPoint::name() const { QString StandardServiceEntryPoint::name() const {
return QSL("RSS/RDF/ATOM/JSON"); return QSL("RSS/RDF/ATOM/JSON");

2
src/librssguard-standard/src/standardserviceroot.cpp
View File

@ -37,7 +37,7 @@
#endif #endif
#if defined(ENABLE_COMPRESSED_SITEMAP) #if defined(ENABLE_COMPRESSED_SITEMAP)
#include <librssguard/3rd-party/qcompressor/qcompressor.h> #include "src/3rd-party/qcompressor/qcompressor.h"
#endif #endif
#include <QAction> #include <QAction>

17
src/librssguard/CMakeLists.txt
View File

@ -711,23 +711,6 @@ if(SQLite3_FOUND)
) )
endif() endif()
if(ZLIB_FOUND)
target_include_directories(rssguard AFTER
PRIVATE
${ZLIB_INCLUDE_DIRS}
)
target_compile_definitions(rssguard
PRIVATE
ENABLE_COMPRESSED_SITEMAP
)
target_link_libraries(rssguard PRIVATE
${ZLIB_LIBRARIES}
)
endif(ZLIB_FOUND)
# Qt. # Qt.
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Core

3
src/librssguard/miscellaneous/pluginfactory.cpp
View File

@ -60,8 +60,9 @@ QStringList PluginFactory::pluginPaths() const {
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("..") + QDir::separator() + QL1S("lib") + paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("..") + QDir::separator() + QL1S("lib") +
QDir::separator() + QL1S(APP_LOW_NAME); QDir::separator() + QL1S(APP_LOW_NAME);
#else #elif defined(Q_OS_WIN)
paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("plugins"); paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("plugins");
#else
paths << QCoreApplication::applicationDirPath(); paths << QCoreApplication::applicationDirPath();
#endif #endif