Skip to content

Commit 32a156c

Browse files
authored
fix: change ffmpeg discovery when building for obs fork (#25)
1 parent 9bf76c3 commit 32a156c

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,19 @@ include(helpers)
1313

1414
add_library(obs-moq MODULE)
1515

16-
if(NOT ${BUILD_PLUGIN})
16+
if(${BUILD_PLUGIN})
1717
find_package(libobs REQUIRED)
18+
# FFmpeg dependency
19+
include(FindPkgConfig)
20+
pkg_check_modules(FFMPEG REQUIRED libavcodec libavutil libswscale libswresample)
21+
target_include_directories(obs-moq PRIVATE ${FFMPEG_INCLUDE_DIRS})
22+
target_link_directories(obs-moq PRIVATE ${FFMPEG_LIBRARY_DIRS})
23+
target_link_libraries(obs-moq PRIVATE ${FFMPEG_LIBRARIES})
24+
else()
25+
find_package(FFmpeg REQUIRED avcodec avutil swscale swresample)
26+
target_link_libraries(obs-moq PRIVATE FFmpeg::avcodec FFmpeg::avutil FFmpeg::swscale FFmpeg::swresample)
1827
endif()
28+
1929
target_link_libraries(obs-moq PRIVATE OBS::libobs)
2030

2131
option(MOQ_LOCAL "Path to moq repo for local development" "")
@@ -54,13 +64,6 @@ if(ENABLE_QT)
5464
)
5565
endif()
5666

57-
# FFmpeg dependency
58-
include(FindPkgConfig)
59-
pkg_check_modules(FFMPEG REQUIRED libavcodec libavutil libswscale libswresample)
60-
target_include_directories(obs-moq PRIVATE ${FFMPEG_INCLUDE_DIRS})
61-
target_link_directories(obs-moq PRIVATE ${FFMPEG_LIBRARY_DIRS})
62-
target_link_libraries(obs-moq PRIVATE ${FFMPEG_LIBRARIES})
63-
6467
target_sources(
6568
obs-moq
6669
PRIVATE

0 commit comments

Comments
 (0)