From 4a71bf8bc81351b81a9e24a5617adf18b95b08e4 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 11 Jun 2024 12:00:58 +0200 Subject: [PATCH] [channels,rdpecam] fix missing link libraries * add ffmpeg libraries * change channel error checks, only FFMPEG supported currently --- channels/rdpecam/client/CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/channels/rdpecam/client/CMakeLists.txt b/channels/rdpecam/client/CMakeLists.txt index e23cc8c46..83be4b0ae 100644 --- a/channels/rdpecam/client/CMakeLists.txt +++ b/channels/rdpecam/client/CMakeLists.txt @@ -17,16 +17,12 @@ define_channel_client("rdpecam") -# swscale is required and is either part of FFMPEG or standalone library -if(NOT WITH_FFMPEG) - find_package(SWScale REQUIRED) -endif() - -if(NOT WITH_OPENH264 AND NOT WITH_FFMPEG) - message(FATAL_ERROR "WITH_OPENH264 or WITH_FFMPEG required for CHANNEL_RDPECAM_CLIENT") +if(NOT WITH_SWSCALE OR NOT WITH_FFMPEG) + message(FATAL_ERROR "WITH_FFMPEG and WITH_SWSCALE required for CHANNEL_RDPECAM_CLIENT") endif() # currently camera redirect client supported for platforms with Video4Linux only +find_package(SWScale REQUIRED) find_package(V4L) if(V4L_FOUND) set(WITH_V4L ON) @@ -42,7 +38,10 @@ set(${MODULE_PREFIX}_SRCS ) set(${MODULE_PREFIX}_LIBS - freerdp winpr + freerdp + winpr + ${SWScale_LIBRARY} + ${FFMPEG_LIBRARIES} ) add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")