From d37bb843d18966a1b2f38e49363dc9f8ebbaed43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 12 Jun 2020 03:56:33 +0200
Subject: [PATCH] Use private linking for exported CMake targets.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 158b6e1152413e4fa973b70b7469bb1f256a1f38)
---
 interfaces/ktexteditor/CMakeLists.txt | 3 ++-
 kdecore/CMakeLists.txt                | 5 +++--
 kdesu/CMakeLists.txt                  | 3 ++-
 kdeui/CMakeLists.txt                  | 3 ++-
 khtml/CMakeLists.txt                  | 3 ++-
 kinit/CMakeLists.txt                  | 2 +-
 kio/CMakeLists.txt                    | 3 ++-
 kioslave/file/CMakeLists.txt          | 3 +--
 kjs/CMakeLists.txt                    | 3 ++-
 libkmid/CMakeLists.txt                | 3 ++-
 10 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index e86dfdb9f..a234009de 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -90,6 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kdeui-shared kabc-shared kparts-shared
+  LINK kdeui-shared kparts-shared
+  LINK_PRIVATE kabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 06453cfc7..a0563313d 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -129,8 +129,9 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
   EMBED kdecorenetwork-static
-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
-    ${LIBBFD_LIBRARIES} util
+  LINK DCOP-shared kdefx-shared ICE SM ${ZLIB_LIBRARIES}
+  LINK_PRIVATE ltdlc-static ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES}
+    ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index c032d8a48..67afb980d 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -42,7 +42,8 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK kdecore-shared ${LIB_UTIL}
+  LINK kdecore-shared
+  LINK_PRIVATE ${LIB_UTIL}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 664906c9d..9999603a1 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -148,7 +148,8 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${XEXT_LIBRARIES}
+  LINK kdecore-shared
+  LINK_PRIVATE ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${XEXT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index 49fe7239a..18113d993 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -88,7 +88,8 @@ tde_add_library( ${target} SHARED AUTOMOC
   VERSION 4.2.0
   LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static
     khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static
-    kutils-shared kdeprint-shared kjs-shared ${JPEG_LIBRARIES}
+    kutils-shared kdeprint-shared
+  LINK_PRIVATE kjs-shared ${JPEG_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 19b96494c..c1682c698 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -40,7 +40,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kICE-static ltdlc-static kparts-shared ${XFT_LIBRARIES}
+  LINK kICE-static ltdlc-static kparts-shared ${FONTCONFIG_LIBRARIES} ${XFT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index e71107f46..de707c575 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -66,6 +66,7 @@ tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
   VERSION 4.2.0
   EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static
-  LINK ltdlc-static kdeui-shared kdesu-shared kwalletclient-shared ${ACL_LIBRARIES}
+  LINK kdeui-shared kwalletclient-shared
+  LINK_PRIVATE ltdlc-static kdesu-shared ${ACL_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kioslave/file/CMakeLists.txt b/kioslave/file/CMakeLists.txt
index 0462811dc..1fad97845 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/kioslave/file/CMakeLists.txt
@@ -45,7 +45,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK kio-shared ${ACL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
-
diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index e32c6a5ba..8b2024191 100644
--- a/kjs/CMakeLists.txt
+++ b/kjs/CMakeLists.txt
@@ -61,6 +61,7 @@ tde_add_lut( keywords.table lexer.lut.h lexer.cpp )
 tde_add_library( ${target} SHARED
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kdecore-shared ${LIBPCRE_LIBRARIES}
+  LINK kdecore-shared
+  LINK_PRIVATE ${LIBPCRE_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/libkmid/CMakeLists.txt b/libkmid/CMakeLists.txt
index fa7c957bc..a1ba6f119 100644
--- a/libkmid/CMakeLists.txt
+++ b/libkmid/CMakeLists.txt
@@ -46,6 +46,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED
   SOURCES ${${target}_SRCS}
   VERSION 0.0.95
-  LINK kdecore-shared ${ALSA_LIBRARIES}
+  LINK kdecore-shared
+  LINK_PRIVATE ${ALSA_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )