From ee2b6d21b3a8d20736465707224a92906526b7e1 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin.bandali@savoirfairelinux.com>
Date: Thu, 10 Mar 2022 08:40:31 -0500
Subject: [PATCH] cmake: properly find and link ffmpeg's libavutil on GNU/Linux
Change-Id: I41fbc747e0868b70edb23232bb8bfb10ac0f225d
---
CMakeLists.txt | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7de6d5a6..0d45a2ea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,16 +197,13 @@ set(COMMON_HEADERS
${SRC_DIR}/videoprovider.h
)
-# For avframe dependency on Windows/macOS.
-if(NOT DEFINED LIBAV_INCLUDE_PATH)
- set(LIBJAMI_CONTRIB_DIR "${PROJECT_SOURCE_DIR}/../daemon/contrib/")
- if(WIN32)
- set(LIBAV_INCLUDE_PATH ${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include/)
- else()
- set(LIBAV_INCLUDE_PATH ${LIBJAMI_CONTRIB_DIR}/native/ffmpeg)
- endif()
-endif()
-include_directories(${LIBAV_INCLUDE_PATH})
+# For libavutil/avframe.
+set(LIBJAMI_CONTRIB_DIR "${PROJECT_SOURCE_DIR}/../daemon/contrib")
+find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h
+ PATHS
+ ${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
+ ${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include)
+include_directories(${AVUTIL_INCLUDE_DIR})
if(MSVC)
set(WINDOWS_SYS_LIBS
--
GitLab