lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-10 01:35:40 +02:00
Code Activity

build: Fix find_library for contrib avutil on GNU/Linux.

Browse source 
* src/libclient/CMakeLists.txt: Set the right 'hint' path for the call
to find_library for ffmpeg avutil from daemon's contrib, to match the
directory name used by daemon's 'contrib/bootstrap' script: the name
of the directory is the value returned by the C++ compiler (either GNU
or Clang) when invoked with the '-dumpmachine' option.

Change-Id: I03de150aa941a1e32471e5b4cbe507e5d09787f5
This commit is contained in:
Amin Bandali 2022-10-03 11:16:47 -04:00
parent b2947e1cba
commit fb94c38540
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libclient/CMakeLists.txt
View file

@ -329,9 +329,16 @@ find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg ${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include) ${LIBJAMI_CONTRIB_DIR}/build/ffmpeg/Build/win32/x64/include)
include_directories(${AVUTIL_INCLUDE_DIR}) include_directories(${AVUTIL_INCLUDE_DIR})
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE CC_MACHINE)
else()
set(CC_MACHINE "")
endif()
find_library(AVUTIL_LIBRARY avutil find_library(AVUTIL_LIBRARY avutil
HINTS HINTS
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg ${LIBJAMI_CONTRIB_DIR}/${CC_MACHINE}/lib
${LIBJAMI_CONTRIB_DIR}/x86_64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}/lib) ${LIBJAMI_CONTRIB_DIR}/x86_64-apple-darwin${CMAKE_HOST_SYSTEM_VERSION}/lib)
if(ENABLE_LIBWRAP) if(ENABLE_LIBWRAP)