morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] unify ffmpeg and swscale detection

Browse Source
This commit is contained in:
akallabeth
2024-09-09 12:20:06 +02:00
parent 0bbf0b6e80
commit 52ee2e4668
4 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp/CMakeLists.txt
View File

@@ -139,7 +139,7 @@ if (WITH_OPUS)
endif()
if (WITH_SWSCALE)
find_package(SWScale REQUIRED)
find_package(FFmpeg REQUIRED COMPONENTS SWSCALE)
endif(WITH_SWSCALE)
if (WITH_CAIRO)
find_package(Cairo REQUIRED)
@@ -147,8 +147,8 @@ endif(WITH_CAIRO)
# Prefer SWScale over Cairo, both at the same time are not possible.
if (WITH_SWSCALE)
include_directories(SYSTEM ${SWScale_INCLUDE_DIR})
freerdp_library_add(${SWScale_LIBRARY})
include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS})
freerdp_library_add(${SWSCALE_LIBRARY})
endif()
if (WITH_CAIRO)
include_directories(SYSTEM ${CAIRO_INCLUDE_DIR})