Convert to cmake build systemfeat/cmake-conversion

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

84 files changed, 2177 insertions, 11 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..7e2f373
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,18 @@
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### subfolders
+
+add_subdirectory( kvilib )
+add_subdirectory( kvirc )
+add_subdirectory( modules )
+add_subdirectory( scripts )
+add_subdirectory( tdeconf_update )
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
new file mode 100644
index 0000000..cd6a21d
--- /dev/null
+++ b/src/kvilib/CMakeLists.txt
@@ -0,0 +1,104 @@
+
+# prepare includes
+
+file( GLOB_RECURSE _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h )
+list( SORT _includes )
+tde_process_includes( ${_includes} DESTINATION ${PROJECT_NAME} )
+
+
+##### kvilib (shared)
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${X11_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${X11_LIBRARY_DIRS}
+)
+
+if( WITH_TDE )
+  set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
+else( )
+  set( LINK_LIBRARIES ${TQT_LIBRARIES} ${X11_LIBRARIES} )
+endif( )
+
+tde_add_library( kvilib SHARED AUTOMOC
+  SOURCES
+    core/kvi_error.cpp
+    core/kvi_heapobject.cpp
+    core/kvi_malloc.cpp
+    core/kvi_memmove.cpp
+    core/kvi_qstring.cpp
+    core/kvi_string.cpp
+    core/kvi_stringarray.cpp
+    ext/kvi_cmdformatter.cpp
+    ext/kvi_config.cpp
+    ext/kvi_crypt.cpp
+    ext/kvi_databuffer.cpp
+    ext/kvi_dcophelper.cpp
+    ext/kvi_doublebuffer.cpp
+    ext/kvi_garbage.cpp
+    ext/kvi_osinfo.cpp
+    ext/kvi_imagelib.cpp
+    ext/kvi_md5.cpp
+    ext/kvi_mediatype.cpp
+    ext/kvi_miscutils.cpp
+    ext/kvi_msgtype.cpp
+    ext/kvi_parameterlist.cpp
+    ext/kvi_pixmap.cpp
+    ext/kvi_proxydb.cpp
+    ext/kvi_regchan.cpp
+    ext/kvi_regusersdb.cpp
+    ext/kvi_sharedfiles.cpp
+    ext/kvi_stringconversion.cpp
+    file/kvi_file.cpp
+    file/kvi_fileutils.cpp
+    file/kvi_packagefile.cpp
+    irc/kvi_avatar.cpp
+    irc/kvi_avatarcache.cpp
+    irc/kvi_ircmask.cpp
+    irc/kvi_ircserver.cpp
+    irc/kvi_ircserverdb.cpp
+    irc/kvi_ircuserdb.cpp
+    irc/kvi_mirccntrl.cpp
+    irc/kvi_nickserv.cpp
+    irc/kvi_useridentity.cpp
+    net/kvi_dns.cpp
+    net/kvi_http.cpp
+    net/kvi_netutils.cpp
+    net/kvi_socket.cpp
+    net/kvi_ssl.cpp
+    net/kvi_url.cpp
+    system/kvi_env.cpp
+    system/kvi_locale.cpp
+    system/kvi_thread.cpp
+    system/kvi_time.cpp
+    tal/kvi_tal_application.cpp
+    tal/kvi_tal_filedialog.cpp
+    tal/kvi_tal_grid.cpp
+    tal/kvi_tal_groupbox.cpp
+    tal/kvi_tal_hbox.cpp
+    tal/kvi_tal_iconview.cpp
+    tal/kvi_tal_listbox.cpp
+    tal/kvi_tal_listview.cpp
+    tal/kvi_tal_mainwindow.cpp
+    tal/kvi_tal_menubar.cpp
+    tal/kvi_tal_popupmenu.cpp
+    tal/kvi_tal_scrollview.cpp
+    tal/kvi_tal_tabdialog.cpp
+    tal/kvi_tal_textedit.cpp
+    tal/kvi_tal_toolbar.cpp
+    tal/kvi_tal_tooltip.cpp
+    tal/kvi_tal_vbox.cpp
+    tal/kvi_tal_widgetstack.cpp
+    tal/kvi_tal_wizard.cpp
+  LINK ${LINK_LIBRARIES} ${CMAKE_DL_LIBS} ${SSL_LIBRARIES} ${ZLIB_LIBRARIES}
+  VERSION 3.0.0
+  DESTINATION ${LIB_INSTALL_DIR}
+  DEPENDENCIES tde-includes
+)
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index d7e8475..5617c45 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -96,7 +96,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool
 inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy)
 {
 	if(bDeepCopy)
-		kvi_free(szKey);
+		kvi_free((void*)szKey);
 }
 
 inline const char * & kvi_hash_key_default(const char **)
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
new file mode 100644
index 0000000..4009ddd
--- /dev/null
+++ b/src/kvirc/CMakeLists.txt
@@ -0,0 +1,248 @@
+
+# prepare includes
+
+file( GLOB_RECURSE _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h )
+list( SORT _includes )
+tde_process_includes( ${_includes} DESTINATION ${PROJECT_NAME} )
+
+
+##### kvirc (executable)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+if( WITH_TDE )
+  set( LINK_LIBRARIES tdecore-shared tdeui-shared tdeio-shared )
+else( )
+  set( LINK_LIBRARIES ${TQT_LIBRARIES} )
+endif( )
+
+tde_add_library( kvirc SHARED AUTOMOC
+  SOURCES
+    kernel/kvi_action.cpp
+    kernel/kvi_actionmanager.cpp
+    kernel/kvi_app.cpp
+    kernel/kvi_coreactions.cpp
+    kernel/kvi_filetransfer.cpp
+    kernel/kvi_app_fs.cpp
+    kernel/kvi_app_setup.cpp
+    kernel/kvi_asynchronousconnectiondata.cpp
+    kernel/kvi_customtoolbardescriptor.cpp
+    kernel/kvi_customtoolbarmanager.cpp
+    kernel/kvi_iconmanager.cpp
+    kernel/kvi_internalcmd.cpp
+    kernel/kvi_ipc.cpp
+    kernel/kvi_ircdatastreammonitor.cpp
+    kernel/kvi_ircconnection.cpp
+    kernel/kvi_ircconnectionantictcpflooddata.cpp
+    kernel/kvi_ircconnectionasyncwhoisdata.cpp
+    kernel/kvi_ircconnectionnetsplitdetectordata.cpp
+    kernel/kvi_ircconnectiontarget.cpp
+    kernel/kvi_ircconnectiontargetresolver.cpp
+    kernel/kvi_ircconnectionserverinfo.cpp
+    kernel/kvi_ircconnectionstatedata.cpp
+    kernel/kvi_ircconnectionstatistics.cpp
+    kernel/kvi_ircconnectionuserinfo.cpp
+    kernel/kvi_irccontext.cpp
+    kernel/kvi_irclink.cpp
+    kernel/kvi_ircsocket.cpp
+    kernel/kvi_ircurl.cpp
+    kernel/kvi_lagmeter.cpp
+    kernel/kvi_notifylist.cpp
+    kernel/kvi_options.cpp
+    kernel/kvi_sslmaster.cpp
+    kernel/kvi_texticonmanager.cpp
+    kernel/kvi_theme.cpp
+    kernel/kvi_useraction.cpp
+    kernel/kvi_userinput.cpp
+    kvs/kvi_kvs.cpp
+    kvs/kvi_kvs_action.cpp
+    kvs/kvi_kvs_aliasmanager.cpp
+    kvs/kvi_kvs_array.cpp
+    kvs/kvi_kvs_arraycast.cpp
+    kvs/kvi_kvs_asyncdnsoperation.cpp
+    kvs/kvi_kvs_asyncoperation.cpp
+    kvs/kvi_kvs_callbackobject.cpp
+    kvs/kvi_kvs_corecallbackcommands.cpp
+    kvs/kvi_kvs_corefunctions.cpp
+    kvs/kvi_kvs_corefunctions_af.cpp
+    kvs/kvi_kvs_corefunctions_gl.cpp
+    kvs/kvi_kvs_corefunctions_mr.cpp
+    kvs/kvi_kvs_corefunctions_sz.cpp
+    kvs/kvi_kvs_coresimplecommands.cpp
+    kvs/kvi_kvs_coresimplecommands_af.cpp
+    kvs/kvi_kvs_coresimplecommands_gl.cpp
+    kvs/kvi_kvs_coresimplecommands_mr.cpp
+    kvs/kvi_kvs_coresimplecommands_sz.cpp
+    kvs/kvi_kvs_dnsmanager.cpp
+    kvs/kvi_kvs_event.cpp
+    kvs/kvi_kvs_eventhandler.cpp
+    kvs/kvi_kvs_eventmanager.cpp
+    kvs/kvi_kvs_eventtable.cpp
+    kvs/kvi_kvs_hash.cpp
+    kvs/kvi_kvs_kernel.cpp
+    kvs/kvi_kvs_moduleinterface.cpp
+    kvs/kvi_kvs_object.cpp
+    kvs/kvi_kvs_object_class.cpp
+    kvs/kvi_kvs_object_controller.cpp
+    kvs/kvi_kvs_object_functioncall.cpp
+    kvs/kvi_kvs_object_functionhandler.cpp
+    kvs/kvi_kvs_object_functionhandlerimpl.cpp
+    kvs/kvi_kvs_parameterprocessor.cpp
+    kvs/kvi_kvs_parser.cpp
+    kvs/kvi_kvs_parser_command.cpp
+    kvs/kvi_kvs_parser_comment.cpp
+    kvs/kvi_kvs_parser_dollar.cpp
+    kvs/kvi_kvs_parser_expression.cpp
+    kvs/kvi_kvs_parser_lside.cpp
+    kvs/kvi_kvs_parser_specialcommands.cpp
+    kvs/kvi_kvs_popupmanager.cpp
+    kvs/kvi_kvs_popupmenu.cpp
+    kvs/kvi_kvs_processmanager.cpp
+    kvs/kvi_kvs_report.cpp
+    kvs/kvi_kvs_runtimecall.cpp
+    kvs/kvi_kvs_runtimecontext.cpp
+    kvs/kvi_kvs_rwevaluationresult.cpp
+    kvs/kvi_kvs_script.cpp
+    kvs/kvi_kvs_scriptaddonmanager.cpp
+    kvs/kvi_kvs_switchlist.cpp
+    kvs/kvi_kvs_timermanager.cpp
+    kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
+    kvs/kvi_kvs_treenode_aliassimplecommand.cpp
+    kvs/kvi_kvs_treenode_arraycount.cpp
+    kvs/kvi_kvs_treenode_arrayelement.cpp
+    kvs/kvi_kvs_treenode_arrayorhashelement.cpp
+    kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
+    kvs/kvi_kvs_treenode_base.cpp
+    kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
+    kvs/kvi_kvs_treenode_callbackcommand.cpp
+    kvs/kvi_kvs_treenode_command.cpp
+    kvs/kvi_kvs_treenode_commandevaluation.cpp
+    kvs/kvi_kvs_treenode_commandwithparameters.cpp
+    kvs/kvi_kvs_treenode_compositedata.cpp
+    kvs/kvi_kvs_treenode_constantdata.cpp
+    kvs/kvi_kvs_treenode_corecallbackcommand.cpp
+    kvs/kvi_kvs_treenode_corefunctioncall.cpp
+    kvs/kvi_kvs_treenode_coresimplecommand.cpp
+    kvs/kvi_kvs_treenode_data.cpp
+    kvs/kvi_kvs_treenode_datalist.cpp
+    kvs/kvi_kvs_treenode_expression.cpp
+    kvs/kvi_kvs_treenode_expressionreturn.cpp
+    kvs/kvi_kvs_treenode_extendedscopevariable.cpp
+    kvs/kvi_kvs_treenode_functioncall.cpp
+    kvs/kvi_kvs_treenode_globalvariable.cpp
+    kvs/kvi_kvs_treenode_hashcount.cpp
+    kvs/kvi_kvs_treenode_hashelement.cpp
+    kvs/kvi_kvs_treenode_hashreferenceassert.cpp
+    kvs/kvi_kvs_treenode_indirectdata.cpp
+    kvs/kvi_kvs_treenode_instruction.cpp
+    kvs/kvi_kvs_treenode_instructionblock.cpp
+    kvs/kvi_kvs_treenode_localvariable.cpp
+    kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
+    kvs/kvi_kvs_treenode_modulefunctioncall.cpp
+    kvs/kvi_kvs_treenode_modulesimplecommand.cpp
+    kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
+    kvs/kvi_kvs_treenode_objectfield.cpp
+    kvs/kvi_kvs_treenode_objectfunctioncall.cpp
+    kvs/kvi_kvs_treenode_operation.cpp
+    kvs/kvi_kvs_treenode_parameterreturn.cpp
+    kvs/kvi_kvs_treenode_rebindingswitch.cpp
+    kvs/kvi_kvs_treenode_scopeoperator.cpp
+    kvs/kvi_kvs_treenode_simplecommand.cpp
+    kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
+    kvs/kvi_kvs_treenode_specialcommand.cpp
+    kvs/kvi_kvs_treenode_specialcommandbreak.cpp
+    kvs/kvi_kvs_treenode_specialcommandclass.cpp
+    kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+    kvs/kvi_kvs_treenode_specialcommanddo.cpp
+    kvs/kvi_kvs_treenode_specialcommandfor.cpp
+    kvs/kvi_kvs_treenode_specialcommandforeach.cpp
+    kvs/kvi_kvs_treenode_specialcommandif.cpp
+    kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+    kvs/kvi_kvs_treenode_specialcommandunset.cpp
+    kvs/kvi_kvs_treenode_specialcommandwhile.cpp
+    kvs/kvi_kvs_treenode_stringcast.cpp
+    kvs/kvi_kvs_treenode_switchlist.cpp
+    kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
+    kvs/kvi_kvs_treenode_variable.cpp
+    kvs/kvi_kvs_useraction.cpp
+    kvs/kvi_kvs_variant.cpp
+    kvs/kvi_kvs_variantlist.cpp
+    kvs/kvi_kvs_treenode_voidfunctioncall.cpp
+    module/kvi_mexlinkfilter.cpp
+    module/kvi_mexserverimport.cpp
+    module/kvi_mextoolbar.cpp
+    module/kvi_module.cpp
+    module/kvi_moduleextension.cpp
+    module/kvi_modulemanager.cpp
+    sparser/kvi_antispam.cpp
+    sparser/kvi_ircmessage.cpp
+    sparser/kvi_sparser.cpp
+    sparser/kvi_sp_ctcp.cpp
+    sparser/kvi_sp_literal.cpp
+    sparser/kvi_sp_numeric.cpp
+    sparser/kvi_sp_tables.cpp
+    ui/kvi_actiondrawer.cpp
+    ui/kvi_channel.cpp
+    ui/kvi_colorwin.cpp
+    ui/kvi_console.cpp
+    ui/kvi_cryptcontroller.cpp
+    ui/kvi_ctcppagedialog.cpp
+    ui/kvi_customtoolbar.cpp
+    ui/kvi_debugwindow.cpp
+    ui/kvi_dynamictooltip.cpp
+    ui/kvi_filedialog.cpp
+    ui/kvi_frame.cpp
+    ui/kvi_historywin.cpp
+    ui/kvi_htmldialog.cpp
+    ui/kvi_imagedialog.cpp
+    ui/kvi_input.cpp
+    ui/kvi_ipeditor.cpp
+    ui/kvi_irctoolbar.cpp
+    ui/kvi_ircview.cpp
+    ui/kvi_ircviewtools.cpp
+    ui/kvi_listview.cpp
+    ui/kvi_maskeditor.cpp
+    ui/kvi_mdicaption.cpp
+    ui/kvi_mdichild.cpp
+    ui/kvi_mdimanager.cpp
+    ui/kvi_menubar.cpp
+    ui/kvi_modeeditor.cpp
+    ui/kvi_modew.cpp
+    ui/kvi_msgbox.cpp
+    ui/kvi_optionswidget.cpp
+    ui/kvi_query.cpp
+    ui/kvi_scriptbutton.cpp
+    ui/kvi_scripteditor.cpp
+    ui/kvi_selectors.cpp
+    ui/kvi_splash.cpp
+    ui/kvi_statusbar.cpp
+    ui/kvi_statusbarapplet.cpp
+    ui/kvi_taskbar.cpp
+    ui/kvi_texticonwin.cpp
+    ui/kvi_themedlabel.cpp
+    ui/kvi_toolbar.cpp
+    ui/kvi_toolwindows_container.cpp
+    ui/kvi_topicw.cpp
+    ui/kvi_styled_controls.cpp
+    ui/kvi_userlistview.cpp
+    ui/kvi_window.cpp
+  LINK kvilib-shared ${LINK_LIBRARIES}
+  VERSION 3.0.0
+  DESTINATION ${LIB_INSTALL_DIR}
+  DEPENDENCIES tde-includes
+)
+
+tde_add_executable( kvirc AUTOMOC
+  SOURCES kernel/kvi_main.cpp
+  LINK kvirc-shared ${LINK_LIBRARIES}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index cd80567..bfee534 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -38,7 +38,9 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqdatetime.h>
+#ifdef COMPILE_TDE_SUPPORT
 #include <tdestandarddirs.h>
+#endif
 
 #include "config.h"
 
@@ -77,11 +79,11 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
 				}
 			}
 		break;
-		case HelpEN        : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR);        break;
+		case HelpEN        : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR);       break;
 		case HelpNoIntl    : szData.append("help");                                                    break;
-		case Log           : tqDebug("WARNING Global log directory requested!");                         break;
-		case Incoming      : tqDebug("WARNING Global incoming directory requested!");                    break;
-		case Trash         : tqDebug("WARNING Global trash directory requested!");                       break;
+		case Log           : tqDebug("WARNING Global log directory requested!");                       break;
+		case Incoming      : tqDebug("WARNING Global incoming directory requested!");                  break;
+		case Trash         : tqDebug("WARNING Global trash directory requested!");                     break;
 		case Config        : szData.append("config");                                                  break;
 		case Audio         : szData.append("audio");                                                   break;
 		case Scripts       : szData.append("scripts");                                                 break;
@@ -91,11 +93,17 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
 		case DefScript     : szData.append("defscript");                                               break;
 		case License       : szData.append("license");                                                 break;
 		case Filters       : szData.append("filters");                                                 break;
-		case Locale        : szData=locate("locale","");                                               break;
-		case Tmp           : tqDebug("WARNING Global tmp directory requested!");                         break;
+		case Locale        :
+#ifdef COMPILE_TDE_SUPPORT
+		                     szData=locate("locale","");
+#else
+		                     szData.append("locale");
+#endif
+		break;
+		case Tmp           : tqDebug("WARNING Global tmp directory requested!");                       break;
 		case Themes        : szData.append("themes");                                                  break;
 		case Classes       : szData.append("classes");                                                 break;
-		case SmallIcons    : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY);      break;
+		case SmallIcons    : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY);     break;
 	}
 
 	if(!appendFile.isEmpty())
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 8a94def..b1ce89b 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -705,7 +705,15 @@ void KviApp::loadDirectories()
 	// First find the global (readable) one...
 	findGlobalKvircDirectory();
 	// Init locale
-	TQString szLocalePath = locate("locale","");
+	TQString szLocalePath = TQString::null;
+#ifdef COMPILE_TDE_SUPPORT
+	szLocalePath = locate("locale","");
+#else
+	szLocalePath = m_szGlobalKvircDir;
+	szLocalePath.append(KVI_PATH_SEPARATOR);
+	szLocalePath.append("locale");
+	szLocalePath.append(KVI_PATH_SEPARATOR);
+#endif
 	KviLocale::init(this,szLocalePath);
 
 	//__debug_1arg("Global Kvirc directory is %s",m_szGlobalKvircDir.ptr());
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
new file mode 100644
index 0000000..5add52d
--- /dev/null
+++ b/src/modules/CMakeLists.txt
@@ -0,0 +1,63 @@
+##### subfolders
+
+add_subdirectory( about )
+add_subdirectory( action )
+add_subdirectory( actioneditor )
+add_subdirectory( addon )
+add_subdirectory( aliaseditor )
+add_subdirectory( avatar )
+add_subdirectory( chan )
+add_subdirectory( channelsjoin )
+add_subdirectory( clock )
+add_subdirectory( codetester )
+add_subdirectory( config )
+add_subdirectory( context )
+add_subdirectory( dcc )
+add_subdirectory( dialog )
+add_subdirectory( dockwidget )
+add_subdirectory( editor )
+add_subdirectory( eventeditor )
+add_subdirectory( file )
+add_subdirectory( filetransferwindow )
+add_subdirectory( help )
+add_subdirectory( http )
+add_subdirectory( ident )
+add_subdirectory( iograph )
+add_subdirectory( lamerizer )
+add_subdirectory( links )
+add_subdirectory( list )
+add_subdirectory( log )
+add_subdirectory( logview )
+add_subdirectory( mask )
+add_subdirectory( math )
+add_subdirectory( mediaplayer )
+add_subdirectory( mircimport )
+add_subdirectory( my )
+add_subdirectory( notifier )
+add_subdirectory( objects )
+add_subdirectory( options )
+add_subdirectory( perl )
+add_subdirectory( perlcore )
+add_subdirectory( popupeditor )
+add_subdirectory( raweditor )
+add_subdirectory( regchan )
+add_subdirectory( reguser )
+add_subdirectory( rijndael )
+add_subdirectory( setup )
+add_subdirectory( sharedfile )
+add_subdirectory( sharedfileswindow )
+add_subdirectory( snd )
+add_subdirectory( socketspy )
+add_subdirectory( spaste )
+add_subdirectory( str )
+add_subdirectory( system )
+add_subdirectory( term )
+add_subdirectory( texticons )
+add_subdirectory( theme )
+add_subdirectory( tip )
+add_subdirectory( tmphighlight )
+add_subdirectory( toolbar )
+add_subdirectory( toolbareditor )
+add_subdirectory( torrent )
+add_subdirectory( url )
+add_subdirectory( window )
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
new file mode 100644
index 0000000..d5c4de5
--- /dev/null
+++ b/src/modules/about/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviabout
+
+tde_add_kpart( libkviabout AUTOMOC
+  SOURCES libkviabout.cpp aboutdialog.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt
new file mode 100644
index 0000000..9dee341
--- /dev/null
+++ b/src/modules/action/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviaction
+
+tde_add_kpart( libkviaction AUTOMOC
+  SOURCES libkviaction.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt
new file mode 100644
index 0000000..b91de77
--- /dev/null
+++ b/src/modules/actioneditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviactioneditor
+
+tde_add_kpart( libkviactioneditor AUTOMOC
+  SOURCES libkviactioneditor.cpp actioneditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt
new file mode 100644
index 0000000..677793e
--- /dev/null
+++ b/src/modules/addon/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( pics )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviaddon
+
+tde_add_kpart( libkviaddon AUTOMOC
+  SOURCES libkviaddon.cpp managementdialog.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/addon/pics/CMakeLists.txt b/src/modules/addon/pics/CMakeLists.txt
new file mode 100644
index 0000000..7cdf8bb
--- /dev/null
+++ b/src/modules/addon/pics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES kvi_dialog_addons.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt
new file mode 100644
index 0000000..4778cfd
--- /dev/null
+++ b/src/modules/aliaseditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvialiaseditor
+
+tde_add_kpart( libkvialiaseditor AUTOMOC
+  SOURCES libkvialiaseditor.cpp aliaseditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt
new file mode 100644
index 0000000..01c17d1
--- /dev/null
+++ b/src/modules/avatar/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviavatar
+
+tde_add_kpart( libkviavatar AUTOMOC
+  SOURCES libkviavatar.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt
new file mode 100644
index 0000000..718d150
--- /dev/null
+++ b/src/modules/chan/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvichan
+
+tde_add_kpart( libkvichan AUTOMOC
+  SOURCES libkvichan.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt
new file mode 100644
index 0000000..939a379
--- /dev/null
+++ b/src/modules/channelsjoin/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvichannelsjoin
+
+tde_add_kpart( libkvichannelsjoin AUTOMOC
+  SOURCES libkvichannelsjoin.cpp channelsjoinwindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/clock/CMakeLists.txt b/src/modules/clock/CMakeLists.txt
new file mode 100644
index 0000000..8f2bf47
--- /dev/null
+++ b/src/modules/clock/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviclock
+
+tde_add_kpart( libkviclock AUTOMOC
+  SOURCES libkviclock.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt
new file mode 100644
index 0000000..1fb6a35
--- /dev/null
+++ b/src/modules/codetester/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvicodetester
+
+tde_add_kpart( libkvicodetester AUTOMOC
+  SOURCES libkvicodetester.cpp codetester.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt
new file mode 100644
index 0000000..f792084
--- /dev/null
+++ b/src/modules/config/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviconfig
+
+tde_add_kpart( libkviconfig AUTOMOC
+  SOURCES libkviconfig.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt
new file mode 100644
index 0000000..0a152e0
--- /dev/null
+++ b/src/modules/context/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvicontext
+
+tde_add_kpart( libkvicontext AUTOMOC
+  SOURCES libkvicontext.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
new file mode 100644
index 0000000..3bab827
--- /dev/null
+++ b/src/modules/dcc/CMakeLists.txt
@@ -0,0 +1,40 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvidcc
+
+tde_add_kpart( libkvidcc AUTOMOC
+  SOURCES
+    adpcmcodec.cpp
+    broker.cpp
+    canvas.cpp
+    canvaswidget.cpp
+    chat.cpp
+    codec.cpp
+    descriptor.cpp
+    dialogs.cpp
+    gsmcodec.cpp
+    libkvidcc.cpp
+    marshal.cpp
+    requests.cpp
+    send.cpp
+    thread.cpp
+    utils.cpp
+    voice.cpp
+    window.cpp
+  LINK kvirc-shared ${GSM_LIBRARY}
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES kvi_dccfiletransfericons.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp
index 536201e..19f9f57 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/gsmcodec.cpp
@@ -23,10 +23,11 @@
 #define _GSMCODEC_CPP_
 
 #include "gsmcodec.h"
-#include <gsm/gsm.h>
 
 #ifdef COMPILE_USE_GSM
 
+#include <gsm/gsm.h>
+
 #define GSM_PACKED_FRAME_SIZE_IN_BYTES 33
 #define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320
 #define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160
diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt
new file mode 100644
index 0000000..feb38eb
--- /dev/null
+++ b/src/modules/dialog/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvidialog
+
+tde_add_kpart( libkvidialog AUTOMOC
+  SOURCES libkvidialog.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/dockwidget/CMakeLists.txt b/src/modules/dockwidget/CMakeLists.txt
new file mode 100644
index 0000000..21c4fd1
--- /dev/null
+++ b/src/modules/dockwidget/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvidockwidget
+
+tde_add_kpart( libkvidockwidget AUTOMOC
+  SOURCES libkvidockwidget_qt3.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt
new file mode 100644
index 0000000..9b99abd
--- /dev/null
+++ b/src/modules/editor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvieditor
+
+tde_add_kpart( libkvieditor AUTOMOC
+  SOURCES libkvieditor.cpp scripteditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt
new file mode 100644
index 0000000..91156e3
--- /dev/null
+++ b/src/modules/eventeditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvieventeditor
+
+tde_add_kpart( libkvieventeditor AUTOMOC
+  SOURCES libkvieventeditor.cpp eventeditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt
new file mode 100644
index 0000000..98e56e9
--- /dev/null
+++ b/src/modules/file/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvifile
+
+tde_add_kpart( libkvifile AUTOMOC
+  SOURCES libkvifile.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt
new file mode 100644
index 0000000..c041921
--- /dev/null
+++ b/src/modules/filetransferwindow/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( caps )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvifiletransferwindow
+
+tde_add_kpart( libkvifiletransferwindow AUTOMOC
+  SOURCES libkvifiletransferwindow.cpp filetransferwindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/filetransferwindow/caps/CMakeLists.txt b/src/modules/filetransferwindow/caps/CMakeLists.txt
new file mode 100644
index 0000000..d8f0a1b
--- /dev/null
+++ b/src/modules/filetransferwindow/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES filetransferwindow
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/tool
+)
diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt
new file mode 100644
index 0000000..1774653
--- /dev/null
+++ b/src/modules/help/CMakeLists.txt
@@ -0,0 +1,15 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvihelp
+
+tde_add_kpart( libkvihelp AUTOMOC
+  SOURCES libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
new file mode 100644
index 0000000..9035ea4
--- /dev/null
+++ b/src/modules/http/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvihttp
+
+tde_add_kpart( libkvihttp AUTOMOC
+  SOURCES libkvihttp.cpp httpfiletransfer.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES kvi_httpicons.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt
new file mode 100644
index 0000000..fcca70a
--- /dev/null
+++ b/src/modules/ident/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviident
+
+tde_add_kpart( libkviident AUTOMOC
+  SOURCES libkviident.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt
new file mode 100644
index 0000000..01f1297
--- /dev/null
+++ b/src/modules/iograph/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviiograph
+
+tde_add_kpart( libkviiograph AUTOMOC
+  SOURCES libkviiograph.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt
new file mode 100644
index 0000000..fdcc10a
--- /dev/null
+++ b/src/modules/lamerizer/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvilamerizer
+
+tde_add_kpart( libkvilamerizer AUTOMOC
+  SOURCES libkvilamerizer.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES lamerizer
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/crypt
+)
diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt
new file mode 100644
index 0000000..e0e9699
--- /dev/null
+++ b/src/modules/links/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvilinks
+
+tde_add_kpart( libkvilinks AUTOMOC
+  SOURCES libkvilinks.cpp linkswindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt
new file mode 100644
index 0000000..da8f1fc
--- /dev/null
+++ b/src/modules/list/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvilist
+
+tde_add_kpart( libkvilist AUTOMOC
+  SOURCES libkvilist.cpp listwindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt
new file mode 100644
index 0000000..410c9cf
--- /dev/null
+++ b/src/modules/log/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvilog
+
+tde_add_kpart( libkvilog AUTOMOC
+  SOURCES libkvilog.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt
new file mode 100644
index 0000000..76ce5f2
--- /dev/null
+++ b/src/modules/logview/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( caps )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvilogview
+
+tde_add_kpart( libkvilogview AUTOMOC
+  SOURCES libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/logview/caps/CMakeLists.txt b/src/modules/logview/caps/CMakeLists.txt
new file mode 100644
index 0000000..8ce9659
--- /dev/null
+++ b/src/modules/logview/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES logview
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/tool
+)
diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt
new file mode 100644
index 0000000..8ec8d56
--- /dev/null
+++ b/src/modules/mask/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvimask
+
+tde_add_kpart( libkvimask AUTOMOC
+  SOURCES libkvimask.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt
new file mode 100644
index 0000000..d8c47fc
--- /dev/null
+++ b/src/modules/math/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvimath
+
+tde_add_kpart( libkvimath AUTOMOC
+  SOURCES libkvimath.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt
new file mode 100644
index 0000000..f767b5a
--- /dev/null
+++ b/src/modules/mediaplayer/CMakeLists.txt
@@ -0,0 +1,25 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvimediaplayer
+
+tde_add_kpart( libkvimediaplayer AUTOMOC
+  SOURCES
+    libkvimediaplayer.cpp
+    mp_amarokinterface.cpp
+    mp_amipinterface.cpp
+    mp_dcopinterface.cpp
+    mp_interface.cpp
+    mp_jukinterface.cpp
+    mp_mp3.cpp
+    mp_winampinterface.cpp
+    mp_xmmsinterface.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt
new file mode 100644
index 0000000..7ee4664
--- /dev/null
+++ b/src/modules/mircimport/CMakeLists.txt
@@ -0,0 +1,22 @@
+##### subfolders
+
+add_subdirectory( caps )
+add_subdirectory( pics )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvimircimport
+
+tde_add_kpart( libkvimircimport AUTOMOC
+  SOURCES libkvimircimport.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/mircimport/caps/CMakeLists.txt b/src/modules/mircimport/caps/CMakeLists.txt
new file mode 100644
index 0000000..e2063fa
--- /dev/null
+++ b/src/modules/mircimport/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES mircimport
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/serverimport
+)
diff --git a/src/modules/mircimport/pics/CMakeLists.txt b/src/modules/mircimport/pics/CMakeLists.txt
new file mode 100644
index 0000000..020d8b5
--- /dev/null
+++ b/src/modules/mircimport/pics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES kvi_mircimport.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt
new file mode 100644
index 0000000..3a439dc
--- /dev/null
+++ b/src/modules/my/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvimy
+
+tde_add_kpart( libkvimy AUTOMOC
+  SOURCES libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp
+  LINK kvirc-shared ${XSCREENSAVER_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt
new file mode 100644
index 0000000..471de19
--- /dev/null
+++ b/src/modules/notifier/CMakeLists.txt
@@ -0,0 +1,35 @@
+##### subfolders
+
+add_subdirectory( pics )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvinotifier
+
+tde_add_kpart( libkvinotifier AUTOMOC
+  SOURCES
+    libkvinotifier.cpp
+    notifierwindow.cpp
+    notifiermessage.cpp
+    notifierwindowtabs.cpp
+    notifierwindowbody.cpp
+    notifierwindowborder.cpp
+    notifierwindowprogressbar.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES libkvinotifier.kvc
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/config/modules
+)
diff --git a/src/modules/notifier/pics/CMakeLists.txt b/src/modules/notifier/pics/CMakeLists.txt
new file mode 100644
index 0000000..16714bf
--- /dev/null
+++ b/src/modules/notifier/pics/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+  FILES ${_pics}
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
new file mode 100644
index 0000000..ec90efd
--- /dev/null
+++ b/src/modules/objects/CMakeLists.txt
@@ -0,0 +1,57 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviobjects
+
+tde_add_kpart( libkviobjects AUTOMOC
+  SOURCES
+    libkviobjects.cpp
+    class_button.cpp
+    class_buttongroup.cpp
+    class_checkbox.cpp
+    class_combobox.cpp
+    class_dialog.cpp
+    class_dockwindow.cpp
+    class_file.cpp
+    class_groupbox.cpp
+    class_label.cpp
+    class_layout.cpp
+    class_lcd.cpp
+    class_lineedit.cpp
+    class_list.cpp
+    class_listbox.cpp
+    class_listview.cpp
+    class_listviewitem.cpp
+    class_mainwindow.cpp
+    class_menubar.cpp
+    class_multilineedit.cpp
+    class_popupmenu.cpp
+    class_process.cpp
+    class_progressbar.cpp
+    class_radiobutton.cpp
+    class_slider.cpp
+    class_socket.cpp
+    class_spinbox.cpp
+    class_tabwidget.cpp
+    class_toolbar.cpp
+    class_toolbutton.cpp
+    class_painter.cpp
+    class_pixmap.cpp
+    class_tbrowser.cpp
+    class_widget.cpp
+    class_window.cpp
+    class_wizard.cpp
+    class_workspace.cpp
+    class_wrapper.cpp
+    class_urllabel.cpp
+    class_xmlreader.cpp
+    class_vbox.cpp
+    class_hbox.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
new file mode 100644
index 0000000..a2d940f
--- /dev/null
+++ b/src/modules/options/CMakeLists.txt
@@ -0,0 +1,74 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvioptions
+
+configure_file( mkcreateinstanceproc.sh.cmake mkcreateinstanceproc.sh @ONLY )
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/instances.h ${CMAKE_CURRENT_BINARY_DIR}/instances.cpp
+  COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/mkcreateinstanceproc.sh
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_custom_target(
+  _instances_h_cpp
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/instances.h ${CMAKE_CURRENT_BINARY_DIR}/instances.cpp
+)
+
+tde_add_kpart( libkvioptions AUTOMOC
+  SOURCES
+    libkvioptions.cpp
+    container.cpp
+    dialog.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/instances.cpp
+    optw_antispam.cpp
+    optw_avatar.cpp
+    optw_connection.cpp
+    optw_ctcp.cpp
+    optw_ctcpfloodprotection.cpp
+    optw_dcc.cpp
+    optw_generalopt.cpp
+    optw_highlighting.cpp
+    optw_ident.cpp
+    optw_identity.cpp
+    optw_ignore.cpp
+    optw_input.cpp
+    optw_interfacefeatures.cpp
+    optw_interfacelookglobal.cpp
+    optw_irc.cpp
+    optw_ircoutput.cpp
+    optw_ircview.cpp
+    optw_lag.cpp
+    optw_logging.cpp
+    optw_mediatypes.cpp
+    optw_messages.cpp
+    optw_nickserv.cpp
+    optw_notify.cpp
+    optw_protection.cpp
+    optw_proxy.cpp
+    optw_query.cpp
+    optw_servers.cpp
+    optw_sound.cpp
+    optw_ssl.cpp
+    optw_taskbar.cpp
+    optw_textencoding.cpp
+    optw_texticons.cpp
+    optw_theme.cpp
+    optw_tools.cpp
+    optw_transport.cpp
+    optw_topiclabel.cpp
+    optw_away.cpp
+    optw_uparser.cpp
+    optw_urlhandlers.cpp
+    optw_userlist.cpp
+    optw_tray.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+  DEPENDENCIES _instances_h_cpp
+)
diff --git a/src/modules/options/mkcreateinstanceproc.sh.cmake b/src/modules/options/mkcreateinstanceproc.sh.cmake
new file mode 100755
index 0000000..fcedf13
--- /dev/null
+++ b/src/modules/options/mkcreateinstanceproc.sh.cmake
@@ -0,0 +1,439 @@
+#!/bin/sh
+
+#####################################################################################################
+#
+# Generator for instances.h and instances.cpp
+#
+# This file is part of the KVirc irc client distribution
+# Copyright (C) 2001-2006 Szymon Stefanek (pragma at kvirc dot net)
+#
+#####################################################################################################
+
+INSTANCES_H=@CMAKE_CURRENT_BINARY_DIR@/instances.h
+INSTANCES_CPP=@CMAKE_CURRENT_BINARY_DIR@/instances.cpp
+
+echo "" > $INSTANCES_H
+
+######################################################################################################
+cat >> $INSTANCES_H <<EOF
+
+#ifndef __OPTIONS_INSTANCES_H__
+#define __OPTIONS_INSTANCES_H__
+
+//
+//   File : instances.h
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2001-2006 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+
+//
+// Instance creation routines for the KVIrc options module
+// DO NOT EDIT THIS FILE!! ALL CHANGES WILL BE LOST!!
+// This file is automatically generated by mkcreateinstanceproc.sh
+// so any change should go in that script
+//
+
+#include "kvi_optionswidget.h"
+#include "kvi_module.h"
+#include "kvi_pointerlist.h"
+#include "kvi_qstring.h"
+
+typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
+
+
+typedef struct _KviOptionsWidgetInstanceEntry
+{
+	KviOptionsWidget                          * (*createProc)(TQWidget *);
+	KviOptionsWidget                          * pWidget;   // singleton
+	int                                         iIcon;
+	TQString                                     szName;
+	TQString                                     szNameNoLocale;
+	const char                                * szClassName;
+	int                                         iPriority;
+	TQString                                     szKeywords;
+	TQString                                     szKeywordsNoLocale;
+	TQString                                     szGroup;
+	bool                                        bIsContainer;
+	bool                                        bIsNotContained;
+	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
+	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
+} KviOptionsWidgetInstanceEntry;
+
+
+class KviOptionsInstanceManager : public TQObject
+{
+	TQ_OBJECT
+public:
+	KviOptionsInstanceManager();
+	virtual ~KviOptionsInstanceManager();
+protected:
+	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+public:
+	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par);
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
+	void cleanup(KviModule * m);
+protected:
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+protected slots:
+	void widgetDestroyed();
+};
+
+#endif //__OPTIONS_INSTANCES_H__
+
+EOF
+######################################################################################################
+
+CLASS_LIST=`grep -h "[ ]*\:[ ]*public[ ]*KviOptionsWidget" optw_*.h | sed -e 's/[ ]*\:[ ]*public[ ]*KviOptionsWidget'//g | sed -e 's/[ 	]*class[ ]*//g'`
+
+
+echo "" > $INSTANCES_CPP
+
+######################################################################################################
+cat >> $INSTANCES_CPP <<EOF
+
+//
+//   File : instances.cpp
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2001 Szymon Stefanek (stefanek@tin.it)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+
+//
+// Instance creation routines for the KVIrc options module
+// DO NOT EDIT THIS FILE!! ALL CHANGES WILL BE LOST!!
+// This file is automatically generated by mkcreateinstanceproc.sh
+// so any change should go in that script
+//
+
+EOF
+######################################################################################################
+
+
+for afile in optw_*.h; do
+	echo "#include \"$afile\"" >> $INSTANCES_CPP
+done
+
+######################################################################################################
+cat >> $INSTANCES_CPP <<EOF
+
+#include "kvi_locale.h"
+#include "kvi_iconmanager.h"
+#include "instances.h"
+
+int g_iOptionWidgetInstances = 0;
+
+EOF
+######################################################################################################
+
+
+for aclass in $CLASS_LIST; do
+	echo -n "KviOptionsWidget * class$aclass" >> $INSTANCES_CPP
+		echo "_createInstanceProc(TQWidget * parent)" >> $INSTANCES_CPP
+	echo "{" >> $INSTANCES_CPP
+	echo "	return new $aclass(parent);" >> $INSTANCES_CPP
+	echo "}" >> $INSTANCES_CPP
+	echo "" >> $INSTANCES_CPP
+done
+
+######################################################################################################
+cat >> $INSTANCES_CPP <<EOF
+
+
+EOF
+######################################################################################################
+
+for aclass in $CLASS_LIST; do
+	echo "static const char * g_szName_$aclass = KVI_OPTIONS_WIDGET_NAME_$aclass;" >> $INSTANCES_CPP
+	echo "static const char * g_szClassName_$aclass = \"$aclass\";" >> $INSTANCES_CPP
+done
+
+######################################################################################################
+cat >> $INSTANCES_CPP <<EOF
+
+KviOptionsInstanceManager::KviOptionsInstanceManager()
+: TQObject(0)
+{
+
+	//tqDebug("Instantiating");
+	// Create the global widget dict : case sensitive , do not copy keys
+	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree->setAutoDelete(true);
+
+EOF
+######################################################################################################
+
+CLASSDIR="@CMAKE_CURRENT_BINARY_DIR@/.classtmp"
+
+mkdir -p $CLASSDIR
+
+for aclass in $CLASS_LIST; do
+	PARENT=`grep -h "KVI_OPTIONS_WIDGET_PARENT_$aclass" optw_*.h | sed -e 's/#define//g' | sed -e s/KVI_OPTIONS_WIDGET_PARENT_$aclass//g | sed -e 's/[ ]*//g'`
+	if [ -z "$PARENT" ]; then
+		PARENT="NOPARENT"
+	fi
+	echo $aclass >> $CLASSDIR/$PARENT
+done
+
+SPACES=""
+
+printclass()
+{
+	echo "" >> $INSTANCES_CPP
+	found=
+	for anum in $DECLARED; do
+		if [ "$anum" = "$1" ]; then
+			found="yes"
+			break
+		fi
+	done
+	if [ -z "$found" ]; then
+		echo "$3	KviOptionsWidgetInstanceEntry * e$1;" >> $INSTANCES_CPP
+		DECLARED="$DECLARED $1"
+	fi
+	echo "$3	e$1 = new KviOptionsWidgetInstanceEntry;"  >> $INSTANCES_CPP
+	echo -n "$3	e$1->createProc = &class$2"  >> $INSTANCES_CPP
+		echo "_createInstanceProc;"  >> $INSTANCES_CPP
+	echo "$3	e$1->pWidget = 0;" >> $INSTANCES_CPP
+	echo "$3	e$1->szClassName = g_szClassName_$2;" >> $INSTANCES_CPP
+	echo "$3	e$1->iIcon = KVI_OPTIONS_WIDGET_ICON_$2;" >> $INSTANCES_CPP
+
+	echo "$3	#ifdef KVI_OPTIONS_WIDGET_PRIORITY_$2" >> $INSTANCES_CPP
+	echo "$3	e$1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_$2;" >> $INSTANCES_CPP
+	echo "$3	#else" >> $INSTANCES_CPP
+	echo "$3	e$1->iPriority = 0;" >> $INSTANCES_CPP
+	echo "$3	#endif" >> $INSTANCES_CPP
+
+	echo "$3	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_$2" >> $INSTANCES_CPP
+	echo "$3	e$1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_$2;" >> $INSTANCES_CPP
+	echo "$3	e$1->szKeywords = __tr2qs_ctx_no_xgettext(e$1->szKeywordsNoLocale.utf8().data(),\"options\");;" >> $INSTANCES_CPP
+	echo "$3	#endif" >> $INSTANCES_CPP
+
+	echo "$3	#ifdef KVI_OPTIONS_WIDGET_GROUP_$2" >> $INSTANCES_CPP
+	echo "$3	e$1->szGroup = KVI_OPTIONS_WIDGET_GROUP_$2;" >> $INSTANCES_CPP
+	echo "$3	#else" >> $INSTANCES_CPP
+	echo "$3	e$1->szGroup = \"general\";" >> $INSTANCES_CPP
+	echo "$3	#endif" >> $INSTANCES_CPP
+
+	echo "$3	#ifdef KVI_OPTIONS_WIDGET_CONTAINER_$2" >> $INSTANCES_CPP
+	echo "$3	e$1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_$2;" >> $INSTANCES_CPP
+	echo "$3	#else" >> $INSTANCES_CPP
+	echo "$3	e$1->bIsContainer = false;" >> $INSTANCES_CPP
+	echo "$3	#endif" >> $INSTANCES_CPP
+
+	echo "$3	#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_$2" >> $INSTANCES_CPP
+	echo "$3	e$1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_$2;" >> $INSTANCES_CPP
+	echo "$3	#else" >> $INSTANCES_CPP
+	echo "$3	e$1->bIsNotContained = false;" >> $INSTANCES_CPP
+	echo "$3	#endif" >> $INSTANCES_CPP
+
+	echo "$3	e$1->szNameNoLocale = g_szName_$2;" >> $INSTANCES_CPP
+	echo "$3	e$1->szName = __tr2qs_ctx_no_xgettext(g_szName_$2,\"options\");" >> $INSTANCES_CPP
+
+	if [ "$1" = "0" ]; then
+		echo "$3	m_pInstanceTree->append(e$1);" >> $INSTANCES_CPP
+	else
+		VAL=`expr $1 - 1`
+		echo "$3	e$VAL->pChildList->append(e$1);" >> $INSTANCES_CPP
+	fi
+}
+
+addchildren()
+{
+	if [ -f "$CLASSDIR/$2" ]; then
+		LEVEL=`cat $CLASSDIR/$2`
+		for achild in $LEVEL; do
+			printclass $1 $achild "$3"
+			if [ -f "$CLASSDIR/$achild" ]; then
+				echo "" >> $INSTANCES_CPP
+				echo "$3	e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $INSTANCES_CPP
+				echo "$3	e$1->pChildList->setAutoDelete(true);" >> $INSTANCES_CPP
+				NEXTLEVEL=`expr $1 + 1`
+				addchildren $NEXTLEVEL $achild "$3	"
+			else
+				echo "$3	e$1->pChildList = 0;" >> $INSTANCES_CPP
+			fi
+		done
+	fi
+}
+
+addchildren 0 NOPARENT ""
+
+
+rm -fr $CLASSDIR
+
+######################################################################################################
+cat >> $INSTANCES_CPP <<EOF
+
+}
+
+void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+{
+	if(l)
+	{
+		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		{
+			if(e->pWidget)
+			{
+				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				{
+					disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
+					delete e->pWidget->parent();
+					e->pWidget =  0;
+				} else {
+					tqDebug("Ops...i have deleted the options dialog ?");
+				}
+			} //else tqDebug("Clas %s has no widget",e->szName);
+			if(e->pChildList)deleteInstanceTree(e->pChildList);
+		}
+		delete l;
+	}
+}
+
+
+KviOptionsInstanceManager::~KviOptionsInstanceManager()
+{
+	if(m_pInstanceTree)tqDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+}
+
+void KviOptionsInstanceManager::cleanup(KviModule * m)
+{
+	deleteInstanceTree(m_pInstanceTree);
+	m_pInstanceTree = 0;
+}
+
+void KviOptionsInstanceManager::widgetDestroyed()
+{
+	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	if(e)e->pWidget = 0;
+	if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--;
+
+}
+
+KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par)
+{
+	if(!e)return 0;
+	if(!(e->pWidget))
+	{
+		e->pWidget = e->createProc(par);
+		g_iOptionWidgetInstances++;
+		connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
+	}
+	if(e->pWidget->parent() != par)
+	{
+		TQWidget * oldPar = (TQWidget *)e->pWidget->parent();
+		e->pWidget->reparent(par,TQPoint(0,0));
+		delete oldPar;
+	}
+	if(e->bIsContainer)
+	{
+		// need to create the container structure!
+		e->pWidget->createTabbedPage();
+		if(e->pChildList)
+		{
+			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+			tmp.setAutoDelete(false);
+
+			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
+			{
+				// add only non containers and widgets not explicitly marked as noncontained
+				if((!e2->bIsContainer) && (!e2->bIsNotContained))
+				{
+					KviOptionsWidgetInstanceEntry * ee = tmp.first();
+					int idx = 0;
+					while(ee)
+					{
+						if(ee->iPriority >= e2->iPriority)break;
+						idx++;
+						ee = tmp.next();
+					}
+					tmp.insert(idx,e2);
+				}
+			}
+
+			for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
+			{
+				KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget());
+				e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow);
+			}
+		}
+	}
+	return e->pWidget;
+}
+
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+{
+	if(l)
+	{
+		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		{
+			if(ptr == e->pWidget)return e;
+			if(e->pChildList)
+			{
+				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
+				if(e2)return e2;
+			}
+		}
+	}
+	return 0;
+}
+
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+{
+	if(l)
+	{
+		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		{
+			if(kvi_strEqualCI(e->szClassName,clName))return e;
+			if(e->pChildList)
+			{
+				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
+				if(e2)return e2;
+			}
+		}
+	}
+	return 0;
+}
+
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName)
+{
+	return findInstanceEntry(clName,m_pInstanceTree);
+}
+
+
+#include "instances.moc"
+
+EOF
+######################################################################################################
+
diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt
new file mode 100644
index 0000000..d122a44
--- /dev/null
+++ b/src/modules/perl/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviperl
+
+tde_add_kpart( libkviperl AUTOMOC
+  SOURCES libkviperl.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt
new file mode 100644
index 0000000..cf17d7c
--- /dev/null
+++ b/src/modules/perlcore/CMakeLists.txt
@@ -0,0 +1,25 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+  ${PERL_INCLUDE_PATH}
+)
+
+
+##### kviperlcore
+
+add_custom_command(
+  OUTPUT xs.inc
+  COMMAND xsubpp
+  ARGS -noversioncheck -C++ -noprototypes -output xs.inc ${CMAKE_CURRENT_SOURCE_DIR}/KVIrc.xs
+)
+
+add_custom_target( _xs.inc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/xs.inc )
+
+tde_add_kpart( libkviperlcore AUTOMOC
+  SOURCES libkviperlcore.cpp
+  LINK kvirc-shared ${PERL_LIBRARY}
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+  DEPENDENCIES _xs.inc
+)
diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt
new file mode 100644
index 0000000..9fb74c3
--- /dev/null
+++ b/src/modules/popupeditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvipopupeditor
+
+tde_add_kpart( libkvipopupeditor AUTOMOC
+  SOURCES libkvipopupeditor.cpp popupeditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt
new file mode 100644
index 0000000..16cf66a
--- /dev/null
+++ b/src/modules/raweditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviraweditor
+
+tde_add_kpart( libkviraweditor AUTOMOC
+  SOURCES libkviraweditor.cpp raweditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt
new file mode 100644
index 0000000..f0af131
--- /dev/null
+++ b/src/modules/regchan/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviregchan
+
+tde_add_kpart( libkviregchan AUTOMOC
+  SOURCES libkviregchan.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt
new file mode 100644
index 0000000..1b38194
--- /dev/null
+++ b/src/modules/reguser/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvireguser
+
+tde_add_kpart( libkvireguser AUTOMOC
+  SOURCES libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt
new file mode 100644
index 0000000..644c6f3
--- /dev/null
+++ b/src/modules/rijndael/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( caps )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvirijndael
+
+tde_add_kpart( libkvirijndael AUTOMOC
+  SOURCES libkvirijndael.cpp rijndael.cpp ablowfish.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/rijndael/caps/CMakeLists.txt b/src/modules/rijndael/caps/CMakeLists.txt
new file mode 100644
index 0000000..e2d1d76
--- /dev/null
+++ b/src/modules/rijndael/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES rijndael
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/crypt
+)
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
new file mode 100644
index 0000000..c4133fd
--- /dev/null
+++ b/src/modules/setup/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvisetup
+
+tde_add_kpart( libkvisetup AUTOMOC
+  SOURCES libkvisetup.cpp setupwizard.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt
new file mode 100644
index 0000000..dfeedd8
--- /dev/null
+++ b/src/modules/sharedfile/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvisharedfile
+
+tde_add_kpart( libkvisharedfile AUTOMOC
+  SOURCES libkvisharedfile.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt
new file mode 100644
index 0000000..f4fb3ed
--- /dev/null
+++ b/src/modules/sharedfileswindow/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( caps )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvisharedfileswindow
+
+tde_add_kpart( libkvisharedfileswindow AUTOMOC
+  SOURCES libkvisharedfileswindow.cpp sharedfileswindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/sharedfileswindow/caps/CMakeLists.txt b/src/modules/sharedfileswindow/caps/CMakeLists.txt
new file mode 100644
index 0000000..de9f398
--- /dev/null
+++ b/src/modules/sharedfileswindow/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES sharedfileswindow
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/tool
+)
diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt
new file mode 100644
index 0000000..a984469
--- /dev/null
+++ b/src/modules/snd/CMakeLists.txt
@@ -0,0 +1,21 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+  ${ARTS_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${ARTS_LIBRARY_DIRS}
+)
+
+
+##### kvisnd
+
+tde_add_kpart( libkvisnd AUTOMOC
+  SOURCES libkvisnd.cpp
+  LINK kvirc-shared ${ARTS_LIBRARIES} ${AUDIOFILE_LIBRARIES} ${ESD_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 7f0db3f..4f9f929 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -67,7 +67,7 @@
 	#endif //COMPILE_OSS_SUPPORT
 
 	#ifdef COMPILE_ARTS_SUPPORT
-		#include <arts/soundserver.h>
+		#include <soundserver.h>
 
 		static Arts::Dispatcher * g_pArtsDispatcher = 0;
 
diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt
new file mode 100644
index 0000000..11ad88e
--- /dev/null
+++ b/src/modules/socketspy/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvisocketspy
+
+tde_add_kpart( libkvisocketspy AUTOMOC
+  SOURCES libkvisocketspy.cpp socketspywindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt
new file mode 100644
index 0000000..9bd2ed4
--- /dev/null
+++ b/src/modules/spaste/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvispaste
+
+tde_add_kpart( libkvispaste AUTOMOC
+  SOURCES libkvispaste.cpp controller.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt
new file mode 100644
index 0000000..402041b
--- /dev/null
+++ b/src/modules/str/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvistr
+
+tde_add_kpart( libkvistr AUTOMOC
+  SOURCES libkvistr.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt
new file mode 100644
index 0000000..969b778
--- /dev/null
+++ b/src/modules/system/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvisystem
+
+tde_add_kpart( libkvisystem AUTOMOC
+  SOURCES libkvisystem.cpp plugin.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt
new file mode 100644
index 0000000..4715f2e
--- /dev/null
+++ b/src/modules/term/CMakeLists.txt
@@ -0,0 +1,20 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+if( WITH_TDE )
+  set( TDE_LIBRARIES tdeparts-shared )
+endif( )
+
+
+##### kviterm
+
+tde_add_kpart( libkviterm AUTOMOC
+  SOURCES libkviterm.cpp termwidget.cpp termwindow.cpp
+  LINK kvirc-shared ${TDE_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt
new file mode 100644
index 0000000..f960d0e
--- /dev/null
+++ b/src/modules/texticons/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitexticons
+
+tde_add_kpart( libkvitexticons AUTOMOC
+  SOURCES libkvitexticons.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt
new file mode 100644
index 0000000..2f7aa50
--- /dev/null
+++ b/src/modules/theme/CMakeLists.txt
@@ -0,0 +1,17 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitheme
+
+tde_add_kpart( libkvitheme AUTOMOC
+  SOURCES
+    libkvitheme.cpp managementdialog.cpp packthemedialog.cpp savethemedialog.cpp themefunctions.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt
new file mode 100644
index 0000000..389f4ca
--- /dev/null
+++ b/src/modules/tip/CMakeLists.txt
@@ -0,0 +1,28 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitip
+
+tde_add_kpart( libkvitip AUTOMOC
+  SOURCES libkvitip.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
+
+##### other files
+
+install(
+  FILES kvi_tip.png
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
+
+install(
+  FILES libkvitip.kvc libkvitip_it.kvc libkvitip_cs.kvc libkvitip_ru.kvc
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/config/modules
+)
diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt
new file mode 100644
index 0000000..40d5da8
--- /dev/null
+++ b/src/modules/tmphighlight/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitmphighlight
+
+tde_add_kpart( libkvitmphighlight AUTOMOC
+  SOURCES libkvitmphighlight.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt
new file mode 100644
index 0000000..0a31296
--- /dev/null
+++ b/src/modules/toolbar/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitoolbar
+
+tde_add_kpart( libkvitoolbar AUTOMOC
+  SOURCES libkvitoolbar.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt
new file mode 100644
index 0000000..4915b52
--- /dev/null
+++ b/src/modules/toolbareditor/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitoolbareditor
+
+tde_add_kpart( libkvitoolbareditor AUTOMOC
+  SOURCES libkvitoolbareditor.cpp toolbareditor.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt
new file mode 100644
index 0000000..139b902
--- /dev/null
+++ b/src/modules/torrent/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kvitorrent
+
+tde_add_kpart( libkvitorrent AUTOMOC
+  SOURCES libkvitorrent.cpp tc_interface.cpp tc_ktorrentdcopinterface.cpp tc_statusbarapplet.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt
new file mode 100644
index 0000000..33ba3ce
--- /dev/null
+++ b/src/modules/url/CMakeLists.txt
@@ -0,0 +1,21 @@
+##### subfolders
+
+add_subdirectory( caps )
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviurl
+
+tde_add_kpart( libkviurl AUTOMOC
+  SOURCES libkviurl.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/modules/url/caps/CMakeLists.txt b/src/modules/url/caps/CMakeLists.txt
new file mode 100644
index 0000000..671e4cd
--- /dev/null
+++ b/src/modules/url/caps/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+  FILES url
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules/caps/action
+)
diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt
new file mode 100644
index 0000000..40d18fe
--- /dev/null
+++ b/src/modules/window/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}
+)
+
+
+##### kviwindow
+
+tde_add_kpart( libkviwindow AUTOMOC
+  SOURCES libkviwindow.cpp userwindow.cpp
+  LINK kvirc-shared
+  DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}/modules
+)
+
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
new file mode 100644
index 0000000..ee22855
--- /dev/null
+++ b/src/scripts/CMakeLists.txt
@@ -0,0 +1,4 @@
+##### subfolders
+
+add_subdirectory( browser )
+add_subdirectory( helpsearch )
diff --git a/src/scripts/browser/CMakeLists.txt b/src/scripts/browser/CMakeLists.txt
new file mode 100644
index 0000000..433846c
--- /dev/null
+++ b/src/scripts/browser/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(
+  PROGRAMS kvi_run_netscape
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
diff --git a/src/scripts/helpsearch/CMakeLists.txt b/src/scripts/helpsearch/CMakeLists.txt
new file mode 100644
index 0000000..fde3d5d
--- /dev/null
+++ b/src/scripts/helpsearch/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(
+  PROGRAMS kvi_search_help
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
diff --git a/src/tdeconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt
new file mode 100644
index 0000000..15ddd6a
--- /dev/null
+++ b/src/tdeconf_update/CMakeLists.txt
@@ -0,0 +1,11 @@
+##### update files
+
+install(
+  FILES kvirc_soundsystem.upd
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
+)
+
+install(
+  PROGRAMS kvirc_soundsystem_upd.sh
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
+)