Improve auto updater
This commit is contained in:
1 parent
39a50241e4
commit
a151e4e948
6 files changed
+109
-15
No files matched your search
+16
-4
@@ -89,21 +89,30 @@ set(plaYUver_App_RCC
|
||||
resources/playuver.qrc
|
||||
)
|
||||
|
||||
OPTION( USE_FERVOR "Add Fervor support" OFF )
|
||||
|
||||
|
||||
IF( USE_FERVOR )
|
||||
|
||||
SET( FERVOR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/fervor )
|
||||
|
||||
IF(EXISTS ${FERVOR_DIR} )
|
||||
|
||||
SET( FERVOR_APP_NAME ${PROJECT_NAME} )
|
||||
SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} )
|
||||
|
||||
ADD_SUBDIRECTORY( ${FERVOR_DIR} )
|
||||
|
||||
INCLUDE_DIRECTORIES( ${FERVOR_DIR} )
|
||||
LIST(APPEND APP_LINKER_LIBS "Fervor" )
|
||||
|
||||
LIST(APPEND APP_LINKER_LIBS Fervor )
|
||||
|
||||
FIND_PACKAGE( Qt5 REQUIRED Network WebKit WebKitWidgets )
|
||||
|
||||
LIST(APPEND QT_LINKER_LIBS Qt5::Network Qt5::Webkit Qt5::WebKitWidgets )
|
||||
LIST(APPEND QT_LINKER_LIBS Qt5::Network Qt5::WebKit Qt5::WebKitWidgets )
|
||||
LIST(APPEND QT_MODULES Network WebKit WebKitWidgets )
|
||||
|
||||
LIST(APPEND LINKER_LIBS ${FERVOR_DEPENDENCIES} )
|
||||
# LIST(APPEND APP_LINKER_LIBS ${FERVOR_DEPENDENCIES} )
|
||||
INCLUDE_DIRECTORIES( ${FERVOR_INCLUDE_DIRS} )
|
||||
|
||||
SET(QT_USE_QTNETWORK true)
|
||||
@@ -130,6 +139,9 @@ IF( USE_FERVOR )
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
SET_PACKAGE_PROPERTIES(Fervor PROPERTIES URL "http://ffmpeg.org/" DESCRIPTION "Fervor lib includes check for updates feature" TYPE OPTIONAL )
|
||||
ADD_FEATURE_INFO(Fervor USE_FERVOR "Fervor lib includes check for updates feature.")
|
||||
|
||||
IF( USE_QT4 )
|
||||
QT4_WRAP_UI( plaYUver_App_UI_Wrap ${plaYUver_App_UI} )
|
||||
QT4_ADD_RESOURCES( plaYUver_App_RCC ${plaYUver_App_RCC} )
|
||||
@@ -160,7 +172,7 @@ ENDIF()
|
||||
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME} ${plaYUver_App_SRCS} ${HEADERS_MOC_FILES} ${plaYUver_App_UI_Wrap} ${plaYUver_App_RCC} ${WINDOWS_RES_FILE} )
|
||||
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib PlaYUVerModules ${QT_LINKER_LIBS} ${APP_LINKER_LIBS} )
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib PlaYUVerModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} )
|
||||
|
||||
IF( NOT USE_QT4 )
|
||||
QT5_USE_MODULES( ${PROJECT_NAME} ${QT_MODULES} )
|
||||
|
||||
+3
-2
@@ -132,9 +132,10 @@ int main( int argc, char *argv[] )
|
||||
plaYUVerApp mainwindow;
|
||||
mainwindow.show();
|
||||
mainwindow.parseArgs( argc, argv );
|
||||
|
||||
#ifdef USE_FERVOR
|
||||
FvUpdater::sharedUpdater()->SetFeedURL("http://192.168.96.201/share/pixLRA/plaYUVer/PlaYUVerUpdate.xml");
|
||||
FvUpdater::sharedUpdater()->SetDependencies(DEPENDENCIES_STRING);
|
||||
FvUpdater::sharedUpdater()->SetFeedURL("http://192.168.96.201/share/pixLRA/plaYUVer/PlaYUVerUpdate-" UPDATE_CHANNEL ".xml");
|
||||
FvUpdater::sharedUpdater()->SetDependencies("ALL");
|
||||
#endif
|
||||
|
||||
return application.exec();
|
||||
|
||||
+1
-1
@@ -23,10 +23,10 @@
|
||||
*/
|
||||
|
||||
#include <QtDebug>
|
||||
#include "plaYUVerApp.h"
|
||||
#ifdef USE_FERVOR
|
||||
#include "fvupdater.h"
|
||||
#endif
|
||||
#include "plaYUVerApp.h"
|
||||
#include "PlaYUVerSubWindowHandle.h"
|
||||
#include "VideoHandle.h"
|
||||
#include "QualityHandle.h"
|
||||
|
||||
Reference in new issue
Block a user