mirror of
https://github.com/martinrotter/rssguard.git
synced 2025-01-27 07:46:17 +01:00
unify exported targets prefix
This commit is contained in:
parent
8f854b3e77
commit
8fa0a3a723
@ -143,9 +143,11 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
|
||||
endif()
|
||||
|
||||
if(BUILD_WITH_QT6)
|
||||
set(QTTAR Qt)
|
||||
find_package(QT NAMES Qt6)
|
||||
find_package(Qt6 COMPONENTS ${QT_COMPONENTS} Core5Compat REQUIRED)
|
||||
else()
|
||||
set(QTTAR Qt5)
|
||||
find_package(QT NAMES Qt5)
|
||||
find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
|
||||
|
||||
@ -173,12 +175,6 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
#if(NOT OS2)
|
||||
# macro(qt_add_resources)
|
||||
# qt_add_big_resources(${ARGN})
|
||||
# endmacro()
|
||||
#endif()
|
||||
|
||||
# Process oauth service secrets.
|
||||
if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "")
|
||||
add_compile_definitions(
|
||||
@ -276,6 +272,7 @@ elseif(APPLE)
|
||||
)
|
||||
endif()
|
||||
|
||||
# Generate localizations, build library and application.
|
||||
add_subdirectory(localization)
|
||||
add_subdirectory(src/librssguard)
|
||||
add_subdirectory(src/rssguard)
|
||||
|
@ -502,6 +502,7 @@ qt_wrap_ui(SOURCES ${UI_FILES})
|
||||
qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/sql.qrc)
|
||||
qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/rssguard.qrc)
|
||||
|
||||
# Bundle icons on some platforms which do not provide system-wide icon themes.
|
||||
if(APPLE OR WIN32 OR OS2)
|
||||
qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/icons.qrc)
|
||||
endif()
|
||||
@ -529,36 +530,36 @@ target_include_directories(rssguard
|
||||
)
|
||||
|
||||
target_link_libraries(rssguard PUBLIC
|
||||
Qt::Core
|
||||
Qt::Gui
|
||||
Qt::Network
|
||||
Qt::Qml
|
||||
Qt::Sql
|
||||
Qt::Widgets
|
||||
Qt::Xml
|
||||
${QTTAR}::Core
|
||||
${QTTAR}::Gui
|
||||
${QTTAR}::Network
|
||||
${QTTAR}::Qml
|
||||
${QTTAR}::Sql
|
||||
${QTTAR}::Widgets
|
||||
${QTTAR}::Xml
|
||||
)
|
||||
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
target_link_libraries(rssguard PUBLIC
|
||||
Qt::Core5Compat
|
||||
${QTTAR}::Core5Compat
|
||||
)
|
||||
endif()
|
||||
|
||||
if(USE_WEBENGINE)
|
||||
target_link_libraries(rssguard PUBLIC
|
||||
Qt::WebEngineWidgets
|
||||
${QTTAR}::WebEngineWidgets
|
||||
)
|
||||
endif()
|
||||
|
||||
if(NOT OS2)
|
||||
target_link_libraries(rssguard PUBLIC
|
||||
Qt::Multimedia
|
||||
${QTTAR}::Multimedia
|
||||
)
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE AND NOT ANDROID)
|
||||
target_link_libraries(rssguard PUBLIC
|
||||
Qt::DBus
|
||||
${QTTAR}::DBus
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -14,15 +14,15 @@ target_include_directories(app PUBLIC
|
||||
)
|
||||
|
||||
target_link_libraries(app PUBLIC
|
||||
Qt::Core
|
||||
Qt::Gui
|
||||
Qt::Widgets
|
||||
${QTTAR}::Core
|
||||
${QTTAR}::Gui
|
||||
${QTTAR}::Widgets
|
||||
rssguard
|
||||
)
|
||||
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
target_link_libraries(app PUBLIC
|
||||
Qt::Core5Compat
|
||||
${QTTAR}::Core5Compat
|
||||
)
|
||||
endif()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user