Fix various cmake build issues

10 files changed, 16 insertions, 13 deletions

diff --git a/knewsticker/kntsrcfilepropsdlg/CMakeLists.txt b/knewsticker/kntsrcfilepropsdlg/CMakeLists.txt
index f6d02b06..f6871edd 100644
--- a/knewsticker/kntsrcfilepropsdlg/CMakeLists.txt
+++ b/knewsticker/kntsrcfilepropsdlg/CMakeLists.txt
@@ -32,9 +32,9 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kntsrcfilepropsdlg (module) ###############
+##### libkntsrcfilepropsdlg (module) ###############
 
-tde_add_kpart( kntsrcfilepropsdlg AUTOMOC
+tde_add_kpart( libkntsrcfilepropsdlg AUTOMOC
   SOURCES
     kntsrcfilepropsdlg.cpp kntsrcfilepropsdlgwidget.ui
   LINK knewstickercommon-static rss-shared
diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt
index b708b42c..000654da 100644
--- a/kopete/kopete/kconf_update/CMakeLists.txt
+++ b/kopete/kopete/kconf_update/CMakeLists.txt
@@ -39,7 +39,7 @@ install( PROGRAMS
 
 ##### kopete_account_kconf_update (executable) ##
 
-tde_add_executable( kopete_account_kconf_update
+tde_add_executable( "kopete-account-kconf_update"
   SOURCES kopete-account-kconf_update.cpp
   LINK ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
@@ -48,7 +48,7 @@ tde_add_executable( kopete_account_kconf_update
 
 ##### kopete_pluginloader2_kconf_update (executable)
 
-tde_add_executable( kopete_pluginloader2_kconf_update
+tde_add_executable( "kopete-pluginloader2-kconf_update"
   SOURCES kopete-pluginloader2.cpp
   LINK ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
@@ -57,7 +57,7 @@ tde_add_executable( kopete_pluginloader2_kconf_update
 
 ##### kopete_nameTracking_kconf_update (executable)
 
-tde_add_executable( kopete_nameTracking_kconf_update
+tde_add_executable( "kopete-nameTracking-kconf_update"
   SOURCES kopete-nameTracking.cpp
   LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
diff --git a/kopete/libkopete/CMakeLists.txt b/kopete/libkopete/CMakeLists.txt
index bbed2548..d012c2aa 100644
--- a/kopete/libkopete/CMakeLists.txt
+++ b/kopete/libkopete/CMakeLists.txt
@@ -49,7 +49,7 @@ install( FILES
     kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h
     managedconnectionaccount.h kopetenotifydataobject.h
     kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h
-    kopetepluginmanager.h
+    kopetepluginmanager.h kopeteblacklister.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kopete )
 
 
diff --git a/kopete/libkopete/avdevice/CMakeLists.txt b/kopete/libkopete/avdevice/CMakeLists.txt
index fb3f77c4..f385af76 100644
--- a/kopete/libkopete/avdevice/CMakeLists.txt
+++ b/kopete/libkopete/avdevice/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_library( kopete_videodevice SHARED AUTOMOC
     videocontrol.cpp videodevice.cpp videodevicemodelpool.cpp
     videodevicepool.cpp videoinput.cpp bayer.cpp
     sonix_compress.cpp
-  VERSION 1.0.0
+  VERSION 0.0.0
   LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt
index 9539457b..24b4ce81 100644
--- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt
@@ -35,8 +35,8 @@ install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_add_kpart( kio_jabberdisco AUTOMOC
   SOURCES jabberdisco.cpp
   LINK
-    jabberclient-static idn
+    jabberclient-static
     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-    qca-static cutestuff_network-static cutestuff_util-static kio-shared
+    qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/meanwhile/CMakeLists.txt b/kopete/protocols/meanwhile/CMakeLists.txt
index 994f6e31..198dfaac 100644
--- a/kopete/protocols/meanwhile/CMakeLists.txt
+++ b/kopete/protocols/meanwhile/CMakeLists.txt
@@ -35,9 +35,9 @@ link_directories(
 install( FILES kopete_meanwhile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### new_target0 (module) #######################
+##### kopete_meanwhile (module) #######################
 
-tde_add_kpart( new_target0 AUTOMOC
+tde_add_kpart( kopete_meanwhile AUTOMOC
   SOURCES
     meanwhileprotocol.cpp meanwhileaddcontactpage.cpp
     meanwhileeditaccountwidget.cpp meanwhileaccount.cpp
diff --git a/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt b/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
index d98fc837..5a340661 100644
--- a/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
+++ b/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
@@ -20,4 +20,5 @@ tde_add_library( mimic STATIC_PIC
   SOURCES
     mimic.c encode.c decode.c bitstring.c vlc_common.c vlc_encode.c
     vlc_decode.c fdct_quant.c idct_dequant.c colorspace.c deblock.c
+  LINK ${GLIB2_LIBRARIES}
 )
diff --git a/kppp/Rules/CMakeLists.txt b/kppp/Rules/CMakeLists.txt
index bb4f384f..fc2c7026 100644
--- a/kppp/Rules/CMakeLists.txt
+++ b/kppp/Rules/CMakeLists.txt
@@ -12,4 +12,4 @@
 tde_auto_add_subdirectories( )
 
 install( FILES TEMPLATE DESTINATION ${DATA_INSTALL_DIR}/kppp/Rules )
-install( PROGRAMS checkrules DESTINATION ${DATA_INSTALL_DIR} )
+install( PROGRAMS checkrules DESTINATION ${DATA_INSTALL_DIR}/kppp/Rules )
diff --git a/wifi/ConfigureChecks.cmake b/wifi/ConfigureChecks.cmake
index f3a7ddb2..0d2972b1 100644
--- a/wifi/ConfigureChecks.cmake
+++ b/wifi/ConfigureChecks.cmake
@@ -21,7 +21,9 @@ endif( )
 
 
 # check for wireless tools
+tde_save_and_set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-lm" )
 check_library_exists( iw iw_get_stats "" HAVE_IW )
+tde_restore( CMAKE_REQUIRED_FLAGS )
 if( HAVE_IW )
   check_include_file( iwlib.h HAVE_IWLIB_H )
   # we need at least wireless tools >= 27
diff --git a/wifi/kwireless/CMakeLists.txt b/wifi/kwireless/CMakeLists.txt
index e6a9bad3..9cdf1e53 100644
--- a/wifi/kwireless/CMakeLists.txt
+++ b/wifi/kwireless/CMakeLists.txt
@@ -33,5 +33,5 @@ tde_add_kpart( libkwireless AUTOMOC
     kwireless.cpp kwirelesswidget.cpp linuxwirelesswidget.cpp
     propertytablebase.ui propertytable.cpp
   LINK tdeui-shared ${IW_LIBRARY}
-  DESTINATION ${PLUGIN_INSTALL_DIR}
+  DESTINATION ${LIB_INSTALL_DIR}
 )