lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 14:55:43 +02:00
Code Activity

build: Tweak CMakeLists.txt pkg-config usage for finding avutil.

Browse source 
* CMakeLists.txt: Prepend CMAKE_PREFIX_PATH with the location of
libavutil.pc from daemon's contrib before trying to find libavutil
using pkg-config, and remove it afterwards.  Further, there is no need
to link the application executable against libavutil; the application
only needs its headers (libclient, however, does already link against
libavutil).

Change-Id: Iffa5af43bfd1bb62bc24cc94dce292f87e9ecb2a
This commit is contained in:
Amin Bandali 2022-10-03 14:28:56 -04:00
parent fb94c38540
commit 7fb102ed45
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -361,7 +361,12 @@ elseif (NOT APPLE)
endif() endif()
pkg_check_modules(XCB xcb) pkg_check_modules(XCB xcb)
list(PREPEND CMAKE_PREFIX_PATH
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg/libavutil)
pkg_check_modules(LIBAVUTIL libavutil>=55.75.100) pkg_check_modules(LIBAVUTIL libavutil>=55.75.100)
list(REMOVE_ITEM CMAKE_PREFIX_PATH
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg/libavutil)
include_directories( include_directories(
${LIBCLIENT_SRC_DIR} ${LIBCLIENT_SRC_DIR}
@ -557,8 +562,7 @@ elseif (NOT APPLE)
${LIBGDKPIXBUF_LIBRARIES} ${LIBGDKPIXBUF_LIBRARIES}
${GLIB_LIBRARIES} ${GLIB_LIBRARIES}
${GIO_LIBRARIES} ${GIO_LIBRARIES}
${XCB_LIBRARIES} ${XCB_LIBRARIES})
${LIBAVUTIL_LIBRARIES})
# Installation rules # Installation rules
install( install(