cmake: remove manual avutil.h include

should come from daemon public dependencies

Change-Id: I14feae56f49553bdcaad6ee5869ff39aa70fcd68
This commit is contained in:
Adrien Béraud
2025-09-14 17:43:41 -04:00
parent 5123fa767d
commit cc87bd627d
2 changed files with 0 additions and 14 deletions

View File

@@ -459,12 +459,6 @@ endif()
# For libavutil/avframe.
set(LIBJAMI_CONTRIB_DIR "${DAEMON_DIR}/contrib")
find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h
PATHS
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
${LIBJAMI_CONTRIB_DIR}/${CONTRIB_DARWIN_FOLDER}/include/
${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include)
include_directories(${AVUTIL_INCLUDE_DIR})
find_package(Vulkan)
if(Vulkan_FOUND)

View File

@@ -318,12 +318,6 @@ if(APPLE)
endif()
endif()
find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h
PATHS
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
${LIBJAMI_CONTRIB_DIR}/${CONTRIB_DARWIN_FOLDER}/include/
${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include)
include_directories(${AVUTIL_INCLUDE_DIR})
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -494,8 +488,6 @@ if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
endif()
set_target_properties(${LIBCLIENT_NAME}
PROPERTIES VERSION ${LIBCLIENT_VERSION})
target_include_directories(${LIBCLIENT_NAME}
PRIVATE ${AVUTIL_INCLUDE_DIR})
# Set these in the parent scope for use from the top-level
# CMakeLists.txt file.