From 6fa0e8df72e01bb75207a2a22a86809c35075350 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 11 Aug 2020 01:53:43 +0400
Subject: [PATCH] Revert "Unduplicate pkgconfig library in hime_im_client"

This reverts commit 2d8bd57e22e552a5d51b089f7151c77e990e992f.
---
 .../hime_qt/hime_im_client/CMakeLists.txt     | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt
index 75707f3..72d7bea 100644
--- a/external/hime_qt/hime_im_client/CMakeLists.txt
+++ b/external/hime_qt/hime_im_client/CMakeLists.txt
@@ -54,12 +54,29 @@ else()
         CLIENT_LIB=1
     )
 
-    pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
-    pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
+    if (DESKTOP_APP_USE_PACKAGED)
+        pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+        pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
 
-    target_link_libraries(external_hime_im_client
-    PRIVATE
-        PkgConfig::X11
-        PkgConfig::GLIB2
-    )
+        target_link_libraries(external_hime_im_client
+        PRIVATE
+            PkgConfig::X11
+            PkgConfig::GLIB2
+        )
+    else()
+        pkg_check_modules(X11 REQUIRED x11)
+        pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+
+        target_include_directories(external_hime_im_client
+        PRIVATE
+            ${X11_INCLUDE_DIRS}
+            ${GLIB2_INCLUDE_DIRS}
+        )
+
+        target_link_libraries(external_hime_im_client
+        PRIVATE
+            X11
+            glib-2.0
+        )
+    endif()
 endif()