Skip to content

Commit 62321fd

Browse files
ilya-fedinjohn-preston
authored andcommitted
Shorten ffmpeg and glib2 components handling
1 parent 5916836 commit 62321fd

File tree

1 file changed

+6
-39
lines changed

1 file changed

+6
-39
lines changed

cmake/external.cmake

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,9 @@ set(TG_OWT_FFMPEG_INCLUDE_PATH "" CACHE STRING "Include path for ffmpeg.")
4242
function(link_ffmpeg target_name)
4343
if (TG_OWT_PACKAGED_BUILD)
4444
find_package(PkgConfig REQUIRED)
45-
pkg_check_modules(AVCODEC REQUIRED libavcodec)
46-
pkg_check_modules(AVFORMAT REQUIRED libavformat)
47-
pkg_check_modules(AVUTIL REQUIRED libavutil)
48-
pkg_check_modules(SWSCALE REQUIRED libswscale)
49-
pkg_check_modules(SWRESAMPLE REQUIRED libswresample)
50-
target_include_directories(${target_name} SYSTEM
51-
PRIVATE
52-
${AVCODEC_INCLUDE_DIRS}
53-
${AVFORMAT_INCLUDE_DIRS}
54-
${AVUTIL_INCLUDE_DIRS}
55-
${SWSCALE_INCLUDE_DIRS}
56-
${SWRESAMPLE_INCLUDE_DIRS}
57-
)
58-
target_link_libraries(${target_name}
59-
PRIVATE
60-
${AVCODEC_LINK_LIBRARIES}
61-
${AVFORMAT_LINK_LIBRARIES}
62-
${AVUTIL_LINK_LIBRARIES}
63-
${SWSCALE_LINK_LIBRARIES}
64-
${SWRESAMPLE_LINK_LIBRARIES}
65-
)
45+
pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswresample libswscale)
46+
target_include_directories(${target_name} SYSTEM PRIVATE ${FFMPEG_INCLUDE_DIRS})
47+
target_link_libraries(${target_name} PRIVATE ${FFMPEG_LINK_LIBRARIES})
6648
else()
6749
if (TG_OWT_FFMPEG_INCLUDE_PATH STREQUAL "")
6850
message(FATAL_ERROR "You should specify 'TG_OWT_FFMPEG_INCLUDE_PATH'.")
@@ -205,25 +187,10 @@ endfunction()
205187

206188
function(link_glib target_name)
207189
find_package(PkgConfig REQUIRED)
208-
pkg_check_modules(GLIB2 REQUIRED glib-2.0)
209-
pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
210-
pkg_check_modules(GIO REQUIRED gio-2.0)
211-
pkg_check_modules(GIO_UNIX REQUIRED gio-unix-2.0)
212-
target_include_directories(${target_name} SYSTEM
213-
PRIVATE
214-
${GIO_UNIX_INCLUDE_DIRS}
215-
${GIO_INCLUDE_DIRS}
216-
${GOBJECT_INCLUDE_DIRS}
217-
${GLIB2_INCLUDE_DIRS}
218-
)
190+
pkg_check_modules(GLIB2 REQUIRED glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0)
191+
target_include_directories(${target_name} SYSTEM PRIVATE ${GLIB2_INCLUDE_DIRS})
219192
if (TG_OWT_PACKAGED_BUILD)
220-
target_link_libraries(${target_name}
221-
PRIVATE
222-
${GIO_UNIX_LINK_LIBRARIES}
223-
${GIO_LINK_LIBRARIES}
224-
${GOBJECT_LINK_LIBRARIES}
225-
${GLIB2_LINK_LIBRARIES}
226-
)
193+
target_link_libraries(${target_name} PRIVATE ${GLIB2_LINK_LIBRARIES})
227194
endif()
228195
endfunction()
229196

0 commit comments

Comments
 (0)