From 588a8abdac4307bc1727992835032b3388b796a8 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 7 Mar 2024 11:08:40 -0500
Subject: [PATCH] misc: remove some mac-specific compiler warnings
Change-Id: I507637344e781273974fac2482e67556b4473ed3
---
src/libclient/CMakeLists.txt | 2 ++
src/libclient/callmodel.cpp | 11 ++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
index bab7003bd..b1ca5784a 100644
--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
@@ -149,6 +149,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ # Remove warnings related to `import`.
+ add_definitions(-Wno-import-preprocessor-directive-pedantic)
set(CMAKE_MACOSX_RPATH on)
set(CMAKE_SKIP_BUILD_RPATH false)
set(CMAKE_BUILD_WITH_INSTALL_RPATH false)
diff --git a/src/libclient/callmodel.cpp b/src/libclient/callmodel.cpp
index fd032e123..18587c799 100644
--- a/src/libclient/callmodel.cpp
+++ b/src/libclient/callmodel.cpp
@@ -987,22 +987,27 @@ CallModel::getDisplay(int idx, int x, int y, int w, int h)
QString
CallModel::getDisplay(const QString& windowProcessId, const QString& windowId)
{
+#if defined(__APPLE__)
+ Q_UNUSED(windowProcessId)
+ Q_UNUSED(windowId)
+ return {};
+#else
QString sep = libjami::Media::VideoProtocolPrefix::SEPARATOR;
QString ret {};
-#if (defined(Q_OS_UNIX) && !defined(__APPLE__))
+#if defined(Q_OS_UNIX)
Q_UNUSED(windowId);
ret = QString("%1%2:+0,0 window-id:%3")
.arg(libjami::Media::VideoProtocolPrefix::DISPLAY)
.arg(sep)
.arg(windowProcessId);
-#endif
-#ifdef WIN32
+#elif WIN32
ret = QString("%1%2:+0,0 window-id:hwnd=%3")
.arg(libjami::Media::VideoProtocolPrefix::DISPLAY)
.arg(sep)
.arg(windowProcessId);
#endif
return ret;
+#endif
}
CallModelPimpl::CallModelPimpl(const CallModel& linked,
--
GitLab