Conversion to the cmake building system.

Delete empty files (dummy.cpp, xsldbgconfig.h).
Remove hard-coded path for the kmdr-executor executable.
Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
Add man pages taken from the Debian packaging.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

Fix linking - kxsldbgcommon-static and  kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

20 files changed, 311 insertions, 20 deletions

diff --git a/klinkstatus/CMakeLists.txt b/klinkstatus/CMakeLists.txt
new file mode 100644
index 00000000..08aee1f1
--- /dev/null
+++ b/klinkstatus/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( data )
+add_subdirectory( src  )
diff --git a/klinkstatus/data/CMakeLists.txt b/klinkstatus/data/CMakeLists.txt
new file mode 100644
index 00000000..4a0967ef
--- /dev/null
+++ b/klinkstatus/data/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( icons  )
+add_subdirectory( styles )
diff --git a/klinkstatus/data/icons/16x16/CMakeLists.txt b/klinkstatus/data/icons/16x16/CMakeLists.txt
new file mode 100644
index 00000000..f83c3ba4
--- /dev/null
+++ b/klinkstatus/data/icons/16x16/CMakeLists.txt
@@ -0,0 +1,8 @@
+##### icons
+
+install(
+    FILES 304.png
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart/pics
+)
+
+tde_install_icons()
diff --git a/klinkstatus/data/icons/CMakeLists.txt b/klinkstatus/data/icons/CMakeLists.txt
new file mode 100644
index 00000000..33315642
--- /dev/null
+++ b/klinkstatus/data/icons/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory( 16x16 )
+
+
+##### icons
+
+tde_install_icons( klinkstatus )
diff --git a/klinkstatus/data/styles/CMakeLists.txt b/klinkstatus/data/styles/CMakeLists.txt
new file mode 100644
index 00000000..7370d82e
--- /dev/null
+++ b/klinkstatus/data/styles/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+    FILES results_stylesheet.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatus/styles
+)
diff --git a/klinkstatus/src/CMakeLists.txt b/klinkstatus/src/CMakeLists.txt
new file mode 100644
index 00000000..eb3e7bdb
--- /dev/null
+++ b/klinkstatus/src/CMakeLists.txt
@@ -0,0 +1,87 @@
+add_subdirectory( cfg    )
+add_subdirectory( engine )
+add_subdirectory( parser )
+add_subdirectory( utils  )
+add_subdirectory( ui     )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/ui
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/ui/settings
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libklinkstatuspart (kpart)
+
+tde_add_kpart( libklinkstatuspart AUTOMOC
+
+  SOURCES
+        klinkstatus_part.cpp
+        global.cpp
+        actionmanager.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+     settings-static
+     ui-static
+     engine-static
+     klinkstatus-parser-static
+     utils-static
+     
+  DEPENDENCIES
+     ui-static
+     settings-static
+     engine-static
+     klinkstatus-parser-static
+     utils-static
+     
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### klinkstatus (executable)
+
+tde_add_executable( klinkstatus AUTOMOC
+
+  SOURCES
+        klinkstatus.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeparts-shared
+     klinkstatus-parser-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES klinkstatus_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatus
+)
+
+tde_create_translated_desktop( klinkstatus.desktop )
+
+tde_create_translated_desktop(
+    SOURCE klinkstatus_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES klinkstatus_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klinkstatuspart
+)
diff --git a/klinkstatus/src/cfg/CMakeLists.txt b/klinkstatus/src/cfg/CMakeLists.txt
new file mode 100644
index 00000000..41601328
--- /dev/null
+++ b/klinkstatus/src/cfg/CMakeLists.txt
@@ -0,0 +1,32 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### cfg (static)
+
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
+
+tde_add_library( cfg STATIC_PIC AUTOMOC
+
+  SOURCES
+        klsconfig.kcfgc
+        dummy.cpp
+)
+
+
+##### other data
+
+install(
+    FILES klinkstatus.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/klinkstatus/src/cfg/Makefile.am b/klinkstatus/src/cfg/Makefile.am
index 2e74b2ad..02107718 100644
--- a/klinkstatus/src/cfg/Makefile.am
+++ b/klinkstatus/src/cfg/Makefile.am
@@ -2,5 +2,9 @@ kde_kcfg_DATA = klinkstatus.kcfg
 METASOURCES = AUTO
 libcfg_la_LDFLAGS = $(all_libraries)
 noinst_LTLIBRARIES =  libcfg.la
+CLEANFILES = dummy.cpp
 libcfg_la_SOURCES = dummy.cpp klsconfig.kcfgc
-AM_CPPFLAGS=$(all_includes)
\ No newline at end of file
+AM_CPPFLAGS=$(all_includes)
+
+dummy.cpp:
+	echo > dummy.cpp
diff --git a/klinkstatus/src/cfg/dummy.cpp b/klinkstatus/src/cfg/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/klinkstatus/src/cfg/dummy.cpp
+++ /dev/null
diff --git a/klinkstatus/src/engine/CMakeLists.txt b/klinkstatus/src/engine/CMakeLists.txt
new file mode 100644
index 00000000..875c60db
--- /dev/null
+++ b/klinkstatus/src/engine/CMakeLists.txt
@@ -0,0 +1,27 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src/ui
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### engine (static)
+
+tde_add_library( engine STATIC_PIC AUTOMOC
+
+  SOURCES
+        linkchecker.cpp
+        linkstatus.cpp
+        searchmanager.cpp
+        linkfilter.cpp
+  LINK
+     tdehtml-shared
+)
diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h
index 1d2e3bdf..8d4e82ab 100644
--- a/klinkstatus/src/klinkstatus.h
+++ b/klinkstatus/src/klinkstatus.h
@@ -22,7 +22,7 @@
 #define _KLINKSTATUS_H_
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <tdeapplication.h>
diff --git a/klinkstatus/src/parser/CMakeLists.txt b/klinkstatus/src/parser/CMakeLists.txt
new file mode 100644
index 00000000..f86149f7
--- /dev/null
+++ b/klinkstatus/src/parser/CMakeLists.txt
@@ -0,0 +1,25 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### parser (static)
+
+tde_add_library( klinkstatus-parser STATIC_PIC AUTOMOC
+
+  SOURCES
+        htmlparser.cpp
+        http.cpp
+        mstring.cpp
+        node.cpp
+        url.cpp
+)
diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt
new file mode 100644
index 00000000..a2d49e43
--- /dev/null
+++ b/klinkstatus/src/ui/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_subdirectory( settings )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ui (static)
+
+tde_add_library( ui STATIC_PIC AUTOMOC
+
+  SOURCES
+        sessionwidgetbase.ui
+        sessionwidget.cpp tabwidgetsession.cpp
+        klshistorycombo.cpp resultview.cpp
+        treeview.cpp resultssearchbar.cpp
+        documentrootdialog.cpp
+  LINK
+     cfg-static
+)
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 53cdd510..19f3679c 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -591,12 +591,12 @@
     <slot specifier="pure virtual">slotClearComboUrl()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klshistorycombo.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>resultssearchbar.h</includehint>
-    <includehint>treeview.h</includehint>
-    <includehint>kprogress.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klshistorycombo.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">resultssearchbar.h</include>
+	<include location="global" impldecl="in implementation">treeview.h</include>
+	<include location="global" impldecl="in implementation">kprogress.h</include>
+	<include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt
new file mode 100644
index 00000000..d1fb1f3d
--- /dev/null
+++ b/klinkstatus/src/ui/settings/CMakeLists.txt
@@ -0,0 +1,32 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### settings (static)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_library( settings STATIC_PIC AUTOMOC
+
+  SOURCES
+        configsearchdialog.ui
+        configresultsdialog.ui
+        configidentificationdialogui.ui
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+        configidentificationdialog.cpp
+        
+  DEPENDENCIES
+        cfg-static
+)
diff --git a/klinkstatus/src/ui/settings/Makefile.am b/klinkstatus/src/ui/settings/Makefile.am
index 777e9e5c..07fcba6c 100644
--- a/klinkstatus/src/ui/settings/Makefile.am
+++ b/klinkstatus/src/ui/settings/Makefile.am
@@ -2,6 +2,10 @@ INCLUDES = -I$(top_builddir)/klinkstatus/src/cfg -I$(top_builddir)/klinkstatus/s
 METASOURCES = AUTO
 libsettings_la_LDFLAGS = $(all_libraries)
 noinst_LTLIBRARIES =  libsettings.la
+CLEANFILES = dummy.cpp
 libsettings_la_SOURCES = configsearchdialog.ui dummy.cpp configresultsdialog.ui \
 	configidentificationdialog.cpp configidentificationdialogui.ui
 noinst_HEADERS = configidentificationdialog.h
+
+dummy.cpp:
+	echo > dummy.cpp
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 87b73fbf..8b30ed58 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -127,8 +127,8 @@
     <tabstop>buttonDefault</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 72c420ca..097c08fc 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -344,10 +344,7 @@
     <tabstop>kcfg_RememberCheckSettings</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/dummy.cpp b/klinkstatus/src/ui/settings/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/klinkstatus/src/ui/settings/dummy.cpp
+++ /dev/null
diff --git a/klinkstatus/src/utils/CMakeLists.txt b/klinkstatus/src/utils/CMakeLists.txt
new file mode 100644
index 00000000..d52bd7b5
--- /dev/null
+++ b/klinkstatus/src/utils/CMakeLists.txt
@@ -0,0 +1,29 @@
+add_compile_options( ${ICU_CXXFLAGS} )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${LIBXSLT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### utils (static)
+
+tde_add_library( utils STATIC_PIC AUTOMOC
+
+  SOURCES
+        utils.cpp
+        xsl.cpp
+  LINK
+     ${LIBXSLT_LIBRARIES}
+)