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

better qt targets unification

Browse Source
This commit is contained in:
Martin Rotter 2022-02-01 12:15:36 +01:00
parent 3c73b3f91f
commit 2d767afea9
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -143,11 +143,9 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
endif() endif()
if(BUILD_WITH_QT6) if(BUILD_WITH_QT6)
set(QTTAR Qt)
find_package(QT NAMES Qt6) find_package(QT NAMES Qt6)
find_package(Qt6 COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED) find_package(Qt6 COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED)
else() else()
set(QTTAR Qt5)
find_package(QT NAMES Qt5) find_package(QT NAMES Qt5)
find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED) find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)

22
src/librssguard/CMakeLists.txt
View File

@ -530,36 +530,36 @@ target_include_directories(rssguard
) )
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
${QTTAR}::Core Qt${QT_VERSION_MAJOR}::Core
${QTTAR}::Gui Qt${QT_VERSION_MAJOR}::Gui
${QTTAR}::Network Qt${QT_VERSION_MAJOR}::Network
${QTTAR}::Qml Qt${QT_VERSION_MAJOR}::Qml
${QTTAR}::Sql Qt${QT_VERSION_MAJOR}::Sql
${QTTAR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
${QTTAR}::Xml Qt${QT_VERSION_MAJOR}::Xml
) )
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
${QTTAR}::Core5Compat Qt${QT_VERSION_MAJOR}::Core5Compat
) )
endif() endif()
if(USE_WEBENGINE) if(USE_WEBENGINE)
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
${QTTAR}::WebEngineWidgets Qt${QT_VERSION_MAJOR}::WebEngineWidgets
) )
endif() endif()
if(NOT OS2) if(NOT OS2)
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
${QTTAR}::Multimedia Qt${QT_VERSION_MAJOR}::Multimedia
) )
endif() endif()
if(UNIX AND NOT APPLE AND NOT ANDROID) if(UNIX AND NOT APPLE AND NOT ANDROID)
target_link_libraries(rssguard PUBLIC target_link_libraries(rssguard PUBLIC
${QTTAR}::DBus Qt${QT_VERSION_MAJOR}::DBus
) )
endif() endif()

8
src/rssguard/CMakeLists.txt
View File

@ -14,15 +14,15 @@ target_include_directories(app PUBLIC
) )
target_link_libraries(app PUBLIC target_link_libraries(app PUBLIC
${QTTAR}::Core Qt${QT_VERSION_MAJOR}::Core
${QTTAR}::Gui Qt${QT_VERSION_MAJOR}::Gui
${QTTAR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
rssguard rssguard
) )
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
target_link_libraries(app PUBLIC target_link_libraries(app PUBLIC
${QTTAR}::Core5Compat Qt${QT_VERSION_MAJOR}::Core5Compat
) )
endif() endif()