fix: Add a missing library link and a include directory

Add a missing library link and a include directory Log: Need link gsettings-qt and include ffmpeg include directory.
linuxdeepin · May 1, 2023 · 2165b08 · 2165b08
1 parent faa708e
commit 2165b08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Fix-library-link.patch b/Fix-library-link.patch
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -33,15 +33,17 @@ pkg_check_modules(Xcb REQUIRED IMPORTED_TARGET xcb xcb-shape)
 pkg_check_modules(DBusextended REQUIRED IMPORTED_TARGET dbusextended-qt5)
 pkg_check_modules(Gst REQUIRED IMPORTED_TARGET gobject-2.0)
 # IMPORTED_TARGET failed to work for some of libs under flatpak env
-pkg_check_modules(Other REQUIRED  gsettings-qt)
+pkg_check_modules(Other REQUIRED gsettings-qt)
+pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavresample libavutil)
+
+include_directories(${FFMPEG_INCLUDE_DIRS})
 
 qt5_add_resources(RCS ../assets/resources.qrc)
 qt5_add_resources(RCS ../assets/icons/theme-icons.qrc)
 if (${Dtk_VERSION} LESS 2.0.6.1)
     qt5_add_resources(RCS ../assets/theme.qrc)
 endif()
 
-
 file(GLOB_RECURSE SRCS LIST_DIRECTORIES false common/*.cpp widgets/*.cpp libdmr/*.cpp vendor/*.cpp dlna/*.cpp dlna/*.c)
 list(APPEND SRCS main.cpp)
 

diff --git a/src/libdmr/CMakeLists.txt b/src/libdmr/CMakeLists.txt
@@ -11,6 +11,7 @@ add_definitions(-D_LIBDMR_)
 remove_definitions(-D_MOVIE_USE_)
 
 pkg_check_modules(Gst REQUIRED IMPORTED_TARGET gstreamer-1.0 glib-2.0)
+pkg_check_modules(other REQUIRED gsettings-qt)
 
 include_directories(${CMAKE_INCLUDE_CURRENT_DIR})
 
@@ -27,7 +28,7 @@ target_include_directories(${CMD_NAME} PUBLIC
     ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/../backends/mediaplayer ${PROJECT_SOURCE_DIR}/../backends/mpv /usr/include/glib-2.0 /usr/include/gstreamer-1.0)
 
 target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent
-    Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::Multimedia Qt5::MultimediaWidgets Qt5::DBus PkgConfig::Gst GL)
+    Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::Multimedia Qt5::MultimediaWidgets Qt5::DBus PkgConfig::Gst GL gsettings-qt)
 #target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent
 #    Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV GL png jpeg)