This commit is contained in:
Martin Rotter 2023-11-28 08:09:59 +01:00
parent 659fe83940
commit de58e45548
2 changed files with 3 additions and 19 deletions

View File

@ -168,12 +168,6 @@ if(ENABLE_MEDIAPLAYER_LIBMPV)
set(LibMPV_ROOT "${CMAKE_SOURCE_DIR}/resources/scripts/libmpv") set(LibMPV_ROOT "${CMAKE_SOURCE_DIR}/resources/scripts/libmpv")
endif() endif()
list(APPEND QT_COMPONENTS OpenGL)
if(BUILD_WITH_QT6)
list(APPEND QT_COMPONENTS OpenGLWidgets)
endif()
add_compile_definitions(ENABLE_MEDIAPLAYER_LIBMPV) add_compile_definitions(ENABLE_MEDIAPLAYER_LIBMPV)
endif() endif()

View File

@ -829,19 +829,9 @@ elseif(ENABLE_MEDIAPLAYER_LIBMPV)
PRIVATE PRIVATE
${LibMPV_INCLUDE_DIRS} ${LibMPV_INCLUDE_DIRS}
) )
target_link_libraries(rssguard PUBLIC
if(BUILD_WITH_QT6) ${LibMPV_LIBRARIES}
target_link_libraries(rssguard PUBLIC )
Qt${QT_VERSION_MAJOR}::OpenGL
Qt${QT_VERSION_MAJOR}::OpenGLWidgets
${LibMPV_LIBRARIES}
)
else()
target_link_libraries(rssguard PUBLIC
Qt${QT_VERSION_MAJOR}::OpenGL
${LibMPV_LIBRARIES}
)
endif()
endif() endif()
if(UNIX AND NOT APPLE AND NOT ANDROID) if(UNIX AND NOT APPLE AND NOT ANDROID)