From a43f2a6caa671df6c40400d14ceb4ccb97267a51 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 6 Feb 2020 10:34:48 +0100 Subject: [PATCH] Safeguard against multiple definition of dbus-1 target Change-Id: Ibba9ce7ce472fe2939386065087f0b07ad811c3f Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- cmake/FindWrapDBus1.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake index c2668d6cc8e..55f9757c45c 100644 --- a/cmake/FindWrapDBus1.cmake +++ b/cmake/FindWrapDBus1.cmake @@ -2,6 +2,10 @@ # Work around that:-/ # See https://gitlab.freedesktop.org/dbus/dbus/issues/267 for more information +if(DBus1_FOUND OR WrapDBus1_FOUND) + return() +endif() + if(DEFINED ENV{PKG_CONFIG_DIR}) set(__qt_dbus_pcd "$ENV{PKG_CONFIG_DIR}") endif()