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

cmake: fix avutil detection with WITH_SUBMODULE

Browse source 
as the daemon is in client-qt

Change-Id: I9eaf1864450de635767363a0ce17726fd459307d
This commit is contained in:
Sébastien Blin 2022-12-07 12:56:14 -05:00 • committed by Adrien Béraud
parent 19011c10bd
commit 6ac70c64c7
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -288,7 +288,11 @@ else()
endif() endif()
# For libavutil/avframe. # For libavutil/avframe.
set(LIBJAMI_CONTRIB_DIR "${PROJECT_SOURCE_DIR}/../daemon/contrib") if (WITH_DAEMON_SUBMODULE)
set(LIBJAMI_CONTRIB_DIR "${PROJECT_SOURCE_DIR}/daemon/contrib")
else()
set(LIBJAMI_CONTRIB_DIR "${PROJECT_SOURCE_DIR}/../daemon/contrib")
endif()
find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h find_path(AVUTIL_INCLUDE_DIR libavutil/avutil.h
PATHS PATHS
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg ${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
@ -319,7 +323,11 @@ if(MSVC)
add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG) add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
# dependencies # dependencies
set(DRING ${PROJECT_SOURCE_DIR}/../daemon) if (WITH_DAEMON_SUBMODULE)
set(DRING ${PROJECT_SOURCE_DIR}/daemon)
else()
set(DRING ${PROJECT_SOURCE_DIR}/../daemon)
endif()
set(QRENCODE_DIR set(QRENCODE_DIR
${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32) ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)