Fix tdecore directories of linked libraries

(cherry picked from commit 62ac96e110e21c0289e890b6e2a824b61d5cb055)

27 files changed, 32 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b19e0e37..e8b2ff73b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,8 @@ tde_setup_paths( )
 tde_setup_architecture_flags( )
 find_package( TQt )
 
+list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} )
+
 
 ##### add apidox targets ############
 
@@ -607,6 +609,7 @@ endif( WITH_XRANDR )
 pkg_search_module( XRENDER xrender )
 if( XRENDER_FOUND )
   set( HAVE_XRENDER 1 )
+  list( APPEND TDECORE_LIBRARY_DIRS ${XRENDER_LIBRARY_DIRS} )
 else( XRENDER_FOUND)
   message(FATAL_ERROR "\nxrender support is required, but not found on your system" )
 endif( XRENDER_FOUND )
@@ -702,6 +705,7 @@ if( WITH_LIBART )
     message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" )
   endif( NOT LIBART_FOUND )
   set( HAVE_LIBART 1 )
+  list( APPEND TDECORE_LIBRARY_DIRS ${LIBART_LIBRARY_DIRS} )
 endif( WITH_LIBART )
 
 
@@ -716,6 +720,7 @@ if( WITH_LIBIDN )
   check_include_file( "idna.h" HAVE_IDNA_H )
   check_include_file( "punycode.h" HAVE_PUNYCODE_H )
   check_include_file( "stringprep.h" HAVE_STRINGPREP_H )
+  list( APPEND TDECORE_LIBRARY_DIRS ${LIBIDN_LIBRARY_DIRS} )
 endif( WITH_LIBIDN )
 
 ##### check for libbfq ##########################
@@ -849,6 +854,7 @@ if( WITH_GAMIN )
     pkg_search_module( GAMIN gamin )
     if( GAMIN_FOUND )
       set( HAVE_FAM 1 )
+      list( APPEND TDECORE_LIBRARY_DIRS ${GAMIN_LIBRARY_DIRS} )
     else( GAMIN_FOUND )
       message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" )
     endif( GAMIN_FOUND )
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 50984b71f..0a078f3e5 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 ##### headers ###################################
diff --git a/kabc/vcard/CMakeLists.txt b/kabc/vcard/CMakeLists.txt
index f2ac63bac..673c01276 100644
--- a/kabc/vcard/CMakeLists.txt
+++ b/kabc/vcard/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt
index ec5291656..8f3857919 100644
--- a/kconf_update/CMakeLists.txt
+++ b/kconf_update/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 0ea89a3da..28b74c52d 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -35,9 +35,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${LIBIDN_LIBRARY_DIRS}
-  ${LIBART_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt
index d256d21c3..bb0b97c2c 100644
--- a/kdecore/kconfig_compiler/CMakeLists.txt
+++ b/kdecore/kconfig_compiler/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index aa466d999..67b9390e7 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index 9f5b9ef5b..c032d8a48 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index e40154333..22559a1b4 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdeui/kdetrayproxy/CMakeLists.txt b/kdeui/kdetrayproxy/CMakeLists.txt
index 1d26e60a5..351dc3042 100644
--- a/kdeui/kdetrayproxy/CMakeLists.txt
+++ b/kdeui/kdetrayproxy/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index 644a9dbb1..640995f7a 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index ae5285d66..746ef7b67 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 348c4dd8d..73dbfb15e 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index d6bc0cb16..6cda20bb9 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kio/misc/kdesasl/CMakeLists.txt b/kio/misc/kdesasl/CMakeLists.txt
index 081d64799..e50baac2a 100644
--- a/kio/misc/kdesasl/CMakeLists.txt
+++ b/kio/misc/kdesasl/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 9b4b916bc..e4a94a1c2 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt
index 9ae76c0d4..73eb65e91 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index 73dbec835..e32c6a5ba 100644
--- a/kjs/CMakeLists.txt
+++ b/kjs/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
   ${LIBPCRE_LIBDIR}
 )
 
diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/kstyles/highcontrast/config/CMakeLists.txt
index cd575ff3e..0d39accbf 100644
--- a/kstyles/highcontrast/config/CMakeLists.txt
+++ b/kstyles/highcontrast/config/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt
index 45bdb0b68..9bfb5cb17 100644
--- a/kstyles/kthemestyle/CMakeLists.txt
+++ b/kstyles/kthemestyle/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/kstyles/utils/installtheme/CMakeLists.txt
index 8becda904..eb21c56d9 100644
--- a/kstyles/utils/installtheme/CMakeLists.txt
+++ b/kstyles/utils/installtheme/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 ##### kinstalltheme #############################
diff --git a/kunittest/CMakeLists.txt b/kunittest/CMakeLists.txt
index a2ee3fcab..5ab18abd4 100644
--- a/kunittest/CMakeLists.txt
+++ b/kunittest/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kwallet/backend/CMakeLists.txt b/kwallet/backend/CMakeLists.txt
index 8801971da..d447cc255 100644
--- a/kwallet/backend/CMakeLists.txt
+++ b/kwallet/backend/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/kwallet/client/CMakeLists.txt b/kwallet/client/CMakeLists.txt
index 620f52a0b..3c2e68cb6 100644
--- a/kwallet/client/CMakeLists.txt
+++ b/kwallet/client/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/libkmid/CMakeLists.txt b/libkmid/CMakeLists.txt
index 801109bf9..fa7c957bc 100644
--- a/libkmid/CMakeLists.txt
+++ b/libkmid/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/libkscreensaver/CMakeLists.txt b/libkscreensaver/CMakeLists.txt
index cb3a8357d..bb28d1a57 100644
--- a/libkscreensaver/CMakeLists.txt
+++ b/libkscreensaver/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
 list( REMOVE_ITEM CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index b7e0f9aca..829d141a2 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -27,8 +27,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${LIBART_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )