libvpx: Add external_vpx target.
This commit is contained in:
parent
ba0f27e13e
commit
b7a596df98
4 changed files with 52 additions and 2 deletions
1
external/CMakeLists.txt
vendored
1
external/CMakeLists.txt
vendored
|
|
@ -65,6 +65,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
|
||||||
endif()
|
endif()
|
||||||
add_checked_subdirectory(ton)
|
add_checked_subdirectory(ton)
|
||||||
add_checked_subdirectory(variant)
|
add_checked_subdirectory(variant)
|
||||||
|
add_checked_subdirectory(vpx)
|
||||||
add_checked_subdirectory(webrtc)
|
add_checked_subdirectory(webrtc)
|
||||||
if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
||||||
add_checked_subdirectory(xcb)
|
add_checked_subdirectory(xcb)
|
||||||
|
|
|
||||||
2
external/ffmpeg/CMakeLists.txt
vendored
2
external/ffmpeg/CMakeLists.txt
vendored
|
|
@ -39,8 +39,8 @@ else()
|
||||||
${ffmpeg_lib_loc}/libswresample/libswresample.a
|
${ffmpeg_lib_loc}/libswresample/libswresample.a
|
||||||
${ffmpeg_lib_loc}/libswscale/libswscale.a
|
${ffmpeg_lib_loc}/libswscale/libswscale.a
|
||||||
${ffmpeg_lib_loc}/libavutil/libavutil.a
|
${ffmpeg_lib_loc}/libavutil/libavutil.a
|
||||||
desktop-app::external_opus
|
|
||||||
$<TARGET_FILE:desktop-app::external_opus>
|
$<TARGET_FILE:desktop-app::external_opus>
|
||||||
|
$<TARGET_FILE:desktop-app::external_vpx>
|
||||||
)
|
)
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
target_link_static_libraries(external_ffmpeg
|
target_link_static_libraries(external_ffmpeg
|
||||||
|
|
|
||||||
48
external/vpx/CMakeLists.txt
vendored
Normal file
48
external/vpx/CMakeLists.txt
vendored
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
# This file is part of Desktop App Toolkit,
|
||||||
|
# a set of libraries for developing nice desktop applications.
|
||||||
|
#
|
||||||
|
# For license and copyright information please follow this link:
|
||||||
|
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||||
|
|
||||||
|
if (DESKTOP_APP_USE_PACKAGED)
|
||||||
|
add_library(external_vpx INTERFACE IMPORTED GLOBAL)
|
||||||
|
add_library(desktop-app::external_vpx ALIAS external_vpx)
|
||||||
|
|
||||||
|
find_package(PkgConfig REQUIRED)
|
||||||
|
pkg_check_modules(LIBVPX IMPORTED_TARGET vpx>=1.10.0)
|
||||||
|
|
||||||
|
target_link_libraries(external_vpx INTERFACE PkgConfig::LIBVPX)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_library(external_vpx STATIC IMPORTED GLOBAL)
|
||||||
|
add_library(desktop-app::external_vpx ALIAS external_vpx)
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
target_include_directories(external_vpx SYSTEM
|
||||||
|
INTERFACE
|
||||||
|
${libs_loc}/local/include
|
||||||
|
)
|
||||||
|
set(vpx_lib_loc ${libs_loc}/local/lib/Win32)
|
||||||
|
set_target_properties(external_vpx PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${vpx_lib_loc}/vpxmt.lib"
|
||||||
|
IMPORTED_LOCATION_DEBUG "${vpx_lib_loc}/vpxmt.lib"
|
||||||
|
)
|
||||||
|
elseif (APPLE)
|
||||||
|
target_include_directories(external_vpx SYSTEM
|
||||||
|
INTERFACE
|
||||||
|
${libs_loc}/local/include
|
||||||
|
)
|
||||||
|
set_target_properties(external_vpx PROPERTIES
|
||||||
|
IMPORTED_LOCATION ${libs_loc}/local/lib/libvpx.a
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
target_include_directories(external_vpx SYSTEM
|
||||||
|
INTERFACE
|
||||||
|
/usr/local/include
|
||||||
|
)
|
||||||
|
find_library(VPX_LIBRARY libvpx.a REQUIRED)
|
||||||
|
set_target_properties(external_vpx PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${VPX_LIBRARY}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
3
external/webrtc/CMakeLists.txt
vendored
3
external/webrtc/CMakeLists.txt
vendored
|
|
@ -89,7 +89,8 @@ INTERFACE
|
||||||
${webrtc_libs_list}
|
${webrtc_libs_list}
|
||||||
desktop-app::external_openssl
|
desktop-app::external_openssl
|
||||||
desktop-app::external_jpeg
|
desktop-app::external_jpeg
|
||||||
desktop-app::external_opus
|
$<TARGET_FILE:desktop-app::external_opus>
|
||||||
|
$<TARGET_FILE:desktop-app::external_vpx>
|
||||||
)
|
)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue