Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

28 files changed, 34 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51ddfc9b4..6242410d4 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 ############
 
@@ -618,6 +620,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 )
@@ -713,6 +716,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 )
 
 
@@ -727,6 +731,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 ##########################
@@ -865,6 +870,7 @@ if( DBUS_TQT_FOUND )
 else()
   tde_message_fatal( "dbus-1-tqt are required, but not found on your system" )
 endif( )
+list( APPEND TDECORE_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
 
 
 if( WITH_NETWORK_MANAGER_BACKEND )
@@ -925,6 +931,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 01be9831c..01359672f 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/kded/CMakeLists.txt b/kded/CMakeLists.txt
index bb54e2912..1a4433b99 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/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index 3b72a1db6..e4a3a5297 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/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index ac6697cbd..e8530ea58 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/libtdemid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index bc9fdb416..f1fb5c7e3 100644
--- a/libtdemid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/libtdescreensaver/CMakeLists.txt b/libtdescreensaver/CMakeLists.txt
index 2102ff3f9..9846efdcf 100644
--- a/libtdescreensaver/CMakeLists.txt
+++ b/libtdescreensaver/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 e5146680d..bfa304859 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}
 )
 
 
diff --git a/tdeabc/vcard/CMakeLists.txt b/tdeabc/vcard/CMakeLists.txt
index 8ad988434..0e08d3426 100644
--- a/tdeabc/vcard/CMakeLists.txt
+++ b/tdeabc/vcard/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeconf_update/CMakeLists.txt b/tdeconf_update/CMakeLists.txt
index fffb66e80..0f485c195 100644
--- a/tdeconf_update/CMakeLists.txt
+++ b/tdeconf_update/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 87e59ec44..5133be82e 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -37,10 +37,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
-  ${LIBIDN_LIBRARY_DIRS}
-  ${GAMIN_LIBDIR}
-  ${LIBART_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 ##### headers ###################################
diff --git a/tdecore/tdeconfig_compiler/CMakeLists.txt b/tdecore/tdeconfig_compiler/CMakeLists.txt
index a4f24c43e..3da974a53 100644
--- a/tdecore/tdeconfig_compiler/CMakeLists.txt
+++ b/tdecore/tdeconfig_compiler/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index be78311eb..e53695423 100644
--- a/tdeinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeio/misc/CMakeLists.txt b/tdeio/misc/CMakeLists.txt
index 3bfdb0980..64004dbcc 100644
--- a/tdeio/misc/CMakeLists.txt
+++ b/tdeio/misc/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeio/misc/tdentlm/CMakeLists.txt b/tdeio/misc/tdentlm/CMakeLists.txt
index dc26da9a1..a4c23d4e8 100644
--- a/tdeio/misc/tdentlm/CMakeLists.txt
+++ b/tdeio/misc/tdentlm/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeio/misc/tdesasl/CMakeLists.txt b/tdeio/misc/tdesasl/CMakeLists.txt
index d48322d93..4953d9c07 100644
--- a/tdeio/misc/tdesasl/CMakeLists.txt
+++ b/tdeio/misc/tdesasl/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeioslave/http/kcookiejar/CMakeLists.txt b/tdeioslave/http/kcookiejar/CMakeLists.txt
index 289daa4f0..e5e622989 100644
--- a/tdeioslave/http/kcookiejar/CMakeLists.txt
+++ b/tdeioslave/http/kcookiejar/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdelfeditor/CMakeLists.txt b/tdelfeditor/CMakeLists.txt
index c18421cef..b5e21a3a1 100644
--- a/tdelfeditor/CMakeLists.txt
+++ b/tdelfeditor/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
   ${LIBR_LIBDIR}
 )
 
diff --git a/tdestyles/highcontrast/config/CMakeLists.txt b/tdestyles/highcontrast/config/CMakeLists.txt
index 1305f8163..9959e2c78 100644
--- a/tdestyles/highcontrast/config/CMakeLists.txt
+++ b/tdestyles/highcontrast/config/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdestyles/kthemestyle/CMakeLists.txt b/tdestyles/kthemestyle/CMakeLists.txt
index 63d4cdf6f..4c2f06d23 100644
--- a/tdestyles/kthemestyle/CMakeLists.txt
+++ b/tdestyles/kthemestyle/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdestyles/utils/installtheme/CMakeLists.txt b/tdestyles/utils/installtheme/CMakeLists.txt
index da9b81b9a..eee44179d 100644
--- a/tdestyles/utils/installtheme/CMakeLists.txt
+++ b/tdestyles/utils/installtheme/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 ##### kinstalltheme #############################
diff --git a/tdesu/CMakeLists.txt b/tdesu/CMakeLists.txt
index 595157576..8dcf012bd 100644
--- a/tdesu/CMakeLists.txt
+++ b/tdesu/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index b21e63bc1..ecaab92c3 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeui/kdetrayproxy/CMakeLists.txt b/tdeui/kdetrayproxy/CMakeLists.txt
index be341b277..271f6cd79 100644
--- a/tdeui/kdetrayproxy/CMakeLists.txt
+++ b/tdeui/kdetrayproxy/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeunittest/CMakeLists.txt b/tdeunittest/CMakeLists.txt
index 5509d9026..cdabad53b 100644
--- a/tdeunittest/CMakeLists.txt
+++ b/tdeunittest/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdewallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index 59c0bf942..886e6c385 100644
--- a/tdewallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdewallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt
index f222f8bde..531733ac8 100644
--- a/tdewallet/client/CMakeLists.txt
+++ b/tdewallet/client/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )
 
 
diff --git a/tdewidgets/CMakeLists.txt b/tdewidgets/CMakeLists.txt
index 2874d6544..e5e563cd1 100644
--- a/tdewidgets/CMakeLists.txt
+++ b/tdewidgets/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
 )
 
 link_directories(
-  ${TQT_LIBRARY_DIRS}
+  ${TDECORE_LIBRARY_DIRS}
 )