Additional changes to support building with cmake.

Thanks to Slavek Banko.
(cherry picked from commit d71a3e005c)

CMakeLists.txt

@@ -127,6 +127,16 @@ option( BUILD_KWALLET "Build kwallet" ${BUILD_ALL} )
 
 option( BUILD_SUPERKARAMBA "Build superkaramba" ${BUILD_ALL} )
 
+##### add apidox targets ############
+
+add_custom_target(apidox
+  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html"
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+
+add_custom_target(install-apidox
+  COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}"
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+
 ##### configure checks ##########################
 
 include( ConfigureChecks.cmake )

ark/CMakeLists.txt

@@ -45,7 +45,7 @@ tde_add_kdeinit_executable( ark AUTOMOC
 
 ##### arkpart (kpart) ###########################
 
-tde_add_kpart( arkpart AUTOMOC
+tde_add_kpart( libarkpart AUTOMOC
   SOURCES ark_part.cpp arkfactory.cpp zip.cpp
     tar.cpp filelistview.cpp arch.cpp lha.cpp
     compressedfile.cpp zoo.cpp rar.cpp ar.cpp

khexedit/lib/CMakeLists.txt

@@ -47,6 +47,7 @@ tde_add_library( khexeditcommon SHARED AUTOMOC
     kcharcoltextexport.cpp
   LINK kdecore-shared kcontroller-static
     khecodecs-static
+  VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

khexedit/parts/kbytesedit/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 
 ##### kbyteseditwidget (kpart) ##################
 
-tde_add_kpart( kbyteseditwidget AUTOMOC
+tde_add_kpart( libkbyteseditwidget AUTOMOC
   SOURCES kbyteseditwidget.cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
   LINK khexeditcommon-shared kparts-shared

khexedit/parts/kpart/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 
 ##### khexedit2part (kpart) #####################
 
-tde_add_kpart( khexedit2part AUTOMOC
+tde_add_kpart( libkhexedit2part AUTOMOC
   SOURCES khepart.cpp khebrowserextension.cpp
     khepartfactory.cpp
   LINK khexeditcommon-shared kparts-shared

klaptopdaemon/CMakeLists.txt

@@ -50,6 +50,7 @@ tde_add_library( kcmlaptop SHARED AUTOMOC
     daemon_state.cpp wake_laptop.cpp
     krichtextlabel.cpp
   LINK kio-shared
+  VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

kregexpeditor/CMakeLists.txt

@@ -86,7 +86,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC
 
 ##### kregexpeditorgui (kpart) ##################
 
-tde_add_kpart( kregexpeditorgui AUTOMOC
+tde_add_kpart( libkregexpeditorgui AUTOMOC
   SOURCES kregexpeditorfactory.cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
   LINK kregexpeditorcommon-shared

kregexpeditor/KMultiFormListBox/CMakeLists.txt

@@ -38,3 +38,13 @@ tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
     widgetwindow.cpp windowlistboxitem.cpp
 )
 
+
+##### other data ################################
+
+install(
+  FILES
+    kmultiformlistbox.h
+    kmultiformlistboxentry.h
+    kmultiformlistboxfactory.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}
+)

kregexpeditor/KWidgetStreamer/CMakeLists.txt

@@ -33,3 +33,11 @@ tde_add_library( kwidgetstreamer STATIC_PIC AUTOMOC
   SOURCES kwidgetstreamer.cpp
 )
 
+
+##### other data ################################
+
+install(
+  FILES
+    kwidgetstreamer.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}
+)

ksim/library/CMakeLists.txt

@@ -31,7 +31,7 @@ tde_add_library( ksimcore SHARED AUTOMOC
     label.cpp led.cpp progress.cpp
     pluginglobal.cpp pluginloader.cpp
     pluginmodule.cpp ksimconfig.cpp
-  VERSION 1.0
+  VERSION 1.0.0
   LINK kdeui-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )

kwallet/konfigurator/CMakeLists.txt

@@ -37,3 +37,9 @@ install( FILES kwalletconfig.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
+install(
+  FILES
+    kwallet_config.desktop
+    kwalletmanager_show.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)