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

Merge branch 'master' of github.com:martinrotter/rssguard

Browse Source
This commit is contained in:
Martin Rotter 2022-01-31 19:39:32 +01:00
commit ebbda089d9
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
CMakeLists.txt
View File

@ -99,6 +99,7 @@ if(${FORCE_COLORED_OUTPUT})
endif() endif()
# Global compilation switches. # Global compilation switches.
option(BUILD_WITH_QT6 "Build application with Qt 6" OFF)
option(USE_WEBENGINE "Use QtWebEngine for embedded web browser" ON) option(USE_WEBENGINE "Use QtWebEngine for embedded web browser" ON)
option(UPDATE_TRANSLATIONS "Call lupdate to update translation files from source" OFF) option(UPDATE_TRANSLATIONS "Call lupdate to update translation files from source" OFF)
option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GCC/Clang only)" OFF) option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GCC/Clang only)" OFF)
@ -114,8 +115,7 @@ set(INOREADER_CLIENT_ID "" CACHE STRING "Inoreader client ID")
set(INOREADER_CLIENT_SECRET "" CACHE STRING "Inoreader client secret") set(INOREADER_CLIENT_SECRET "" CACHE STRING "Inoreader client secret")
# Import Qt libraries. # Import Qt libraries.
find_package(QT NAMES Qt6 Qt5 REQUIRED) set(QT_COMPONENTS
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS
Core Core
Gui Gui
LinguistTools LinguistTools
@ -126,26 +126,49 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS
Xml Xml
) )
if(QT_VERSION_MAJOR EQUAL 6) if(NOT OS2)
find_package(Qt6 COMPONENTS Core5Compat REQUIRED) list(APPEND QT_COMPONENTS Multimedia)
endif() endif()
if(USE_WEBENGINE) if(USE_WEBENGINE)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WebEngineWidgets REQUIRED) list(APPEND QT_COMPONENTS WebEngineWidgets)
add_compile_definitions(USE_WEBENGINE) add_compile_definitions(USE_WEBENGINE)
endif() endif()
if(UNIX AND NOT APPLE AND NOT ANDROID)
list(APPEND QT_COMPONENTS DBus)
endif()
if(BUILD_WITH_QT6)
find_package(QT NAMES Qt6)
find_package(Qt6 COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED)
else()
find_package(QT NAMES Qt5)
find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
if(Qt5Core_VERSION VERSION_LESS 5.15.0)
# Compatibility macros.
macro(qt_add_resources)
qt5_add_resources(${ARGN})
endmacro()
macro(qt_add_big_resources)
qt5_add_big_resources(${ARGN})
endmacro()
macro(qt_create_translation)
qt5_create_translation(${ARGN})
endmacro()
macro(qt_add_translation)
qt5_add_translation(${ARGN})
endmacro()
endif()
endif()
if(NOT OS2) if(NOT OS2)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Multimedia REQUIRED)
macro(qt_add_resources) macro(qt_add_resources)
qt_add_big_resources(${ARGN}) qt_add_big_resources(${ARGN})
endmacro() endmacro()
endif() endif()
if(UNIX AND NOT APPLE AND NOT ANDROID)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED)
endif()
# Process oauth service secrets. # Process oauth service secrets.
if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "") if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "")
add_compile_definitions( add_compile_definitions(