Skip to content
Snippets Groups Projects
Commit 6ac70c64 authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud
Browse files

cmake: fix avutil detection with WITH_SUBMODULE

as the daemon is in client-qt

Change-Id: I9eaf1864450de635767363a0ce17726fd459307d
parent 19011c10
No related branches found
No related tags found
No related merge requests found
......@@ -288,7 +288,11 @@ else()
endif()
# 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
PATHS
${LIBJAMI_CONTRIB_DIR}/native/ffmpeg
......@@ -319,7 +323,11 @@ if(MSVC)
add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
# 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
${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment