From 6ac70c64c73aa774b76b79da0df7cb7d44475232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 7 Dec 2022 12:56:14 -0500
Subject: [PATCH] cmake: fix avutil detection with WITH_SUBMODULE
as the daemon is in client-qt
Change-Id: I9eaf1864450de635767363a0ce17726fd459307d
---
CMakeLists.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4160a8f41..c537cba14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
--
GitLab