From 29a45b899bbda3ce06329f760b470ea7f1cbdcf1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Dec 2020 17:19:42 +0400
Subject: [PATCH] Deduplicate jpeg and zlib linking in qt

---
 external/qt/CMakeLists.txt | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index db226ce..e33d215 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -208,11 +208,6 @@ else()
         foreach (lib ${qt_libs})
             list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
         endforeach()
-        target_link_libraries(external_qt
-        INTERFACE
-            desktop-app::external_jpeg
-            desktop-app::external_zlib
-        )
     elseif (APPLE)
         if (NOT build_osx)
             set(qt_libs
@@ -246,8 +241,6 @@ else()
         endforeach()
         target_link_libraries(external_qt
         INTERFACE
-            desktop-app::external_jpeg
-            desktop-app::external_zlib
             cups
         )
     else()
@@ -313,6 +306,8 @@ else()
         ${qt_libs_list}
         $<TARGET_FILE:desktop-app::external_openssl_ssl>
         $<TARGET_FILE:desktop-app::external_openssl_crypto>
+        desktop-app::external_jpeg
+        desktop-app::external_zlib
     )
 
     if (LINUX)
@@ -378,8 +373,6 @@ else()
         endif()
         target_link_libraries(external_qt
         INTERFACE
-            desktop-app::external_jpeg
-            desktop-app::external_zlib
             ICE
             SM
             fontconfig