From 127a1ada32419582616989905679a693ce0c5cb4 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 26 Jan 2021 10:52:50 +0100
Subject: [PATCH] Change XCB::XFIXES condition in library mapping

Replace condition of XCB::XFIXES from the 'XCB_XFIXES_FOUND' variable
to 'TARGET XCB::XFIXES'.

Fixes: QTBUG-89979
Change-Id: I77b8b4046dc6852ecb209d942ee94d864a35c378
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 util/cmake/helper.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index c27208c712d..c23c1d6f71a 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -566,14 +566,16 @@ _library_map = [
         "XCB",
         "XCB::XFIXES",
         extra=["COMPONENTS", "XFIXES"],
-        resultVariable="XCB_XFIXES",
+        resultVariable="TARGET XCB::XFIXES",
+        appendFoundSuffix=False,
     ),
     LibraryMapping(
         "xcb-xfixes",
         "XCB",
         "XCB::XFIXES",
         extra=["COMPONENTS", "XFIXES"],
-        resultVariable="XCB_XFIXES",
+        resultVariable="TARGET XCB::XFIXES",
+        appendFoundSuffix=False,
     ),
     LibraryMapping(
         "xcb_xinput",