kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Don't require breakpad/ffmpeg build directories on Linux

Browse source
This commit is contained in:
Ilya Fedin 2022-04-17 07:29:07 +04:00 • committed by John Preston
parent ed1411f129
commit 8ca7ff8484
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
external/crash_reports/breakpad/CMakeLists.txt vendored
View file

@ -7,10 +7,19 @@
add_library(external_breakpad INTERFACE IMPORTED GLOBAL) add_library(external_breakpad INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_breakpad ALIAS external_breakpad) add_library(desktop-app::external_breakpad ALIAS external_breakpad)
target_include_directories(external_breakpad SYSTEM if (LINUX)
INTERFACE find_package(PkgConfig REQUIRED)
${libs_loc}/breakpad/src pkg_check_modules(BREAKPAD REQUIRED breakpad)
) target_include_directories(external_breakpad SYSTEM
INTERFACE
${BREAKPAD_INCLUDE_DIRS}
)
else()
target_include_directories(external_breakpad SYSTEM
INTERFACE
${libs_loc}/breakpad/src
)
endif()
if (build_win64) if (build_win64)
set(breakpad_config_add _x64) set(breakpad_config_add _x64)

36
external/ffmpeg/CMakeLists.txt vendored
View file

@ -25,25 +25,41 @@ if (DESKTOP_APP_USE_PACKAGED)
PkgConfig::SWRESAMPLE PkgConfig::SWRESAMPLE
) )
else() else()
target_include_directories(external_ffmpeg SYSTEM if (LINUX)
INTERFACE target_link_static_libraries(external_ffmpeg
${libs_loc}/ffmpeg INTERFACE
) avformat
avcodec
swresample
swscale
avutil
)
else()
set(ffmpeg_lib_loc ${libs_loc}/ffmpeg)
set(ffmpeg_lib_loc ${libs_loc}/ffmpeg) target_include_directories(external_ffmpeg SYSTEM
INTERFACE
${ffmpeg_lib_loc}
)
target_link_libraries(external_ffmpeg
INTERFACE
${ffmpeg_lib_loc}/libavformat/libavformat.a
${ffmpeg_lib_loc}/libavcodec/libavcodec.a
${ffmpeg_lib_loc}/libswresample/libswresample.a
${ffmpeg_lib_loc}/libswscale/libswscale.a
${ffmpeg_lib_loc}/libavutil/libavutil.a
)
endif()
target_link_libraries(external_ffmpeg target_link_libraries(external_ffmpeg
INTERFACE INTERFACE
${ffmpeg_lib_loc}/libavformat/libavformat.a
${ffmpeg_lib_loc}/libavcodec/libavcodec.a
${ffmpeg_lib_loc}/libswresample/libswresample.a
${ffmpeg_lib_loc}/libswscale/libswscale.a
${ffmpeg_lib_loc}/libavutil/libavutil.a
$<LINK_ONLY:desktop-app::external_opus> $<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_opus> $<TARGET_FILE:desktop-app::external_opus>
$<LINK_ONLY:desktop-app::external_vpx> $<LINK_ONLY:desktop-app::external_vpx>
$<TARGET_FILE:desktop-app::external_vpx> $<TARGET_FILE:desktop-app::external_vpx>
) )
if (APPLE) if (APPLE)
target_link_libraries(external_ffmpeg INTERFACE bz2) target_link_libraries(external_ffmpeg INTERFACE bz2)
elseif (LINUX) elseif (LINUX)