Conversion to the cmake building system.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a6454b1658d325d6ff2d6ba6c349b772148798e0)

33 files changed, 1238 insertions, 106 deletions

diff --git a/kmymoney2/CMakeLists.txt b/kmymoney2/CMakeLists.txt
new file mode 100644
index 0000000..16173e2
--- /dev/null
+++ b/kmymoney2/CMakeLists.txt
@@ -0,0 +1,150 @@
+
+add_subdirectory( mymoney )
+add_subdirectory( widgets )
+add_subdirectory( dialogs )
+add_subdirectory( wizards )
+add_subdirectory( views )
+add_subdirectory( converter )
+add_subdirectory( pics )
+add_subdirectory( icons )
+add_subdirectory( html )
+add_subdirectory( plugins )
+add_subdirectory( reports )
+add_subdirectory( misc )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/dialogs
+  ${CMAKE_SOURCE_DIR}/libkdchart
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kmymoneysettings (static)
+
+tde_add_library( kmymoneysettings STATIC_PIC AUTOMOC
+  SOURCES
+    kmymoneysettings.kcfgc
+    kmymoneyglobalsettings.cpp
+    kmymoneyutils.cpp
+
+  LINK
+    dialogs-static
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### kmymoney2 (executable) ####################
+
+tde_add_executable( kmymoney2 AUTOMOC
+  SOURCES
+    kstartuplogo.cpp
+    kmymoney2.cpp
+    main.cpp
+    kmymoney2.stub
+    kmymoney2.skel
+
+  LINK
+    kmymoneysettings-static kgpgfile-static
+    settings-static views-static interfaces-static
+    newaccountwizard-static newuserwizard-static wizardpages-static
+    kmm_mymoney-shared kmm_plugin-shared kmm_kdchart-shared
+    tdecore-shared tdeui-shared tdeio-shared tdehtml-shared tdeabc-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+add_custom_command(
+  OUTPUT kmymoney
+  COMMENT "Creating kmymoney symlink"
+  COMMAND ln -s kmymoney2 kmymoney
+  DEPENDS kmymoney2
+)
+add_custom_target( kmymoney-symlink ALL
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kmymoney
+)
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/kmymoney
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### kmymoneytest (test) #######################
+
+tde_add_check_executable( kmymoneytest AUTOMOC
+  SOURCES
+    kmymoneytest.cpp
+
+  LINK
+    kmymoneysettings-static
+    convertertest-static
+    mymoneytest-static
+    reportstest-static
+    storagetest-static
+    kmm_mymoney-shared
+    tdeio-shared
+    ${CPPUNIT_LIBRARY}
+)
+
+
+##### other data
+
+tde_install_icons()
+
+file( GLOB mimetype_icons RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} mimetype*.png )
+list( SORT mimetype_icons )
+foreach( mimetype_icon IN LISTS mimetype_icons )
+  string( REGEX MATCH "^([0-9a-zA-Z]+)_([a-z]+)_(.*)\\.png$" _dummy "${mimetype_icon}" )
+  set( _type  "${CMAKE_MATCH_1}" )
+  set( _name  "${CMAKE_MATCH_2}" )
+  set( _size  "${CMAKE_MATCH_3}" )
+  install(
+    FILES ${mimetype_icon}
+    DESTINATION ${ICON_INSTALL_DIR}/hicolor/${_size}/mimetypes RENAME ${_name}.png
+  )
+endforeach()
+
+tde_create_translated_desktop( kmymoney2.desktop )
+
+tde_create_translated_desktop(
+  SOURCE x-kmymoney2.desktop
+  DESTINATION ${MIME_INSTALL_DIR}/application
+)
+
+install(
+  FILES kmymoney2ui.rc tips
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2
+)
+
+install(
+  FILES kmymoney2.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
+
+install(
+  DIRECTORY templates/
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/templates
+  PATTERN "Makefile.am" EXCLUDE
+)
+
+kmm_install_includes(
+  FILES
+    export.h
+    kmymoneyutils.h
+    kmymoneyglobalsettings.h
+    ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/converter/CMakeLists.txt b/kmymoney2/converter/CMakeLists.txt
new file mode 100644
index 0000000..785e2e4
--- /dev/null
+++ b/kmymoney2/converter/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kmymoney2
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### converter (static)
+
+tde_add_library( converter STATIC_PIC AUTOMOC
+  SOURCES
+    mymoneygncreader.cpp
+    mymoneyqifreader.cpp
+    mymoneyqifwriter.cpp
+    mymoneyqifprofile.cpp
+    mymoneytemplate.cpp
+    mymoneystatementreader.cpp
+    webpricequote.cpp
+
+  DEPENDENCIES
+    kmm-includes
+    dialogs-static
+)
+
+
+##### convertertest (static)
+
+tde_add_library( convertertest STATIC_PIC AUTOMOC
+  SOURCES
+    convertertest.cpp
+
+  LINK
+    converter-static
+
+  DEPENDENCIES
+    kmm-includes
+
+  EXCLUDE_FROM_ALL
+)
+
+
+##### other data
+
+kmm_install_includes(
+  FILES mymoneytemplate.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/dialogs/CMakeLists.txt b/kmymoney2/dialogs/CMakeLists.txt
new file mode 100644
index 0000000..6da4978
--- /dev/null
+++ b/kmymoney2/dialogs/CMakeLists.txt
@@ -0,0 +1,134 @@
+
+add_subdirectory( settings )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_SOURCE_DIR}/libkdchart
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../mymoney
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### dialogs (static)
+
+tde_add_library( dialogs STATIC_PIC AUTOMOC
+  SOURCES
+    kreportconfigurationfilterdlg.cpp
+    kcurrencycalculator.cpp
+    kcurrencyeditdlg.cpp
+    keditequityentrydlg.cpp
+    keditloanwizard.cpp
+    knewloanwizard.cpp
+    kenterscheduledlg.cpp
+    tderecentfileitem.cpp
+    keditscheduledlg.cpp
+    mymoneyqifprofileeditor.cpp
+    kaccountselectdlg.cpp
+    kupdatestockpricedlg.cpp
+    knewequityentrydlg.cpp
+    kstartdlg.cpp
+    kreconciledlg.cpp
+    knewfiledlg.cpp
+    knewbankdlg.cpp
+    knewaccountdlg.cpp
+    kfindtransactiondlg.cpp
+    kendingbalancedlg.cpp
+    ksplittransactiondlg.cpp
+    kimportdlg.cpp
+    kexportdlg.cpp
+    kcsvprogressdlg.cpp
+    kchooseimportexportdlg.cpp
+    kbackupdlg.cpp
+    kequitypriceupdatedlg.cpp
+    kmymoneypricedlg.cpp
+    knewinvestmentwizard.cpp
+    ksecuritylisteditor.cpp
+    kgncimportoptionsdlg.cpp
+    konlinequoteconfigurationdlg.cpp
+    kgncpricesourcedlg.cpp
+    kmymoneyfileinfodlg.cpp
+    tdeselectdatabasedlg.cpp
+    kpayeereassigndlg.cpp
+    kcategoryreassigndlg.cpp
+    tdeconfirmmanualenterdlg.cpp
+    kaccountselectdlgdecl.ui
+    kbackupdlgdecl.ui
+    kchooseimportexportdlgdecl.ui
+    tdeconfirmmanualenterdlgdecl.ui
+    kcsvprogressdlgdecl.ui
+    kcurrencycalculatordecl.ui
+    kcurrencyeditdlgdecl.ui
+    keditequityentrydecl.ui
+    keditscheduledlgdecl.ui
+    kendingbalancedlgdecl.ui
+    kenterscheduledlgdecl.ui
+    kequitypriceupdatedlgdecl.ui
+    kexportdlgdecl.ui
+    kfindtransactiondlgdecl.ui
+    kgncimportoptionsdlgdecl.ui
+    kimportdlgdecl.ui
+    kmymoneypricedlgdecl.ui
+    knewaccountdlgdecl.ui
+    knewbankdlgdecl.ui
+    knewequityentrydecl.ui
+    knewfiledlgdecl.ui
+    knewinvestmentwizarddecl.ui
+    knewloanwizarddecl.ui
+    konlinequoteconfigurationdecl.ui
+    kreconciledlgdecl.ui
+    ksecuritylisteditordecl.ui
+    ksplitcorrectiondlg.ui
+    ksplittransactiondlgdecl.ui
+    kupdatestockpricedlgdecl.ui
+    mymoneyqifprofileeditordecl.ui
+    kgncpricesourcedlgdecl.ui
+    kmymoneyfileinfodlgdecl.ui
+    tdeselectdatabasedlgdecl.ui
+    kpayeereassigndlgdecl.ui
+    kcategoryreassigndlgdecl.ui
+    transactioneditor.cpp
+    investtransactioneditor.cpp
+    investactivities.cpp
+    kbalancechartdlg.cpp
+    kplugindlg.ui
+    kgpgkeyselectiondlg.cpp
+    transactionmatcher.cpp
+    kbalancewarning.cpp
+    knewbudgetdlgdecl.ui
+    knewbudgetdlg.cpp
+    tdeselecttransactionsdlgdecl.ui
+    tdeselecttransactionsdlg.cpp
+    kmergetransactionsdlg.cpp
+    ksortoptiondlg.ui
+    kloadtemplatedlgdecl.ui
+    kloadtemplatedlg.cpp
+    kmymoneysplittable.cpp
+
+  LINK
+    widgets-static
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### other data
+
+kmm_install_includes(
+  FILES
+    kcurrencycalculator.h
+    investtransactioneditor.h
+    transactioneditor.h
+    ${CMAKE_CURRENT_BINARY_DIR}/kcurrencycalculatordecl.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/dialogs/kbackupdlg.h b/kmymoney2/dialogs/kbackupdlg.h
index a99b803..5671e0e 100644
--- a/kmymoney2/dialogs/kbackupdlg.h
+++ b/kmymoney2/dialogs/kbackupdlg.h
@@ -21,7 +21,7 @@
 #define KBACKUPDIALOG_H
 
 #include <tqwidget.h>
-#include "../dialogs/kbackupdlgdecl.h"
+#include "kbackupdlgdecl.h"
 
 /**
   *@author Michael Edwardes
diff --git a/kmymoney2/dialogs/settings/CMakeLists.txt b/kmymoney2/dialogs/settings/CMakeLists.txt
new file mode 100644
index 0000000..66366e7
--- /dev/null
+++ b/kmymoney2/dialogs/settings/CMakeLists.txt
@@ -0,0 +1,46 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### settings (static)
+
+tde_add_library( settings STATIC_PIC AUTOMOC
+  SOURCES
+    ksettingsgeneraldecl.ui
+    ksettingsgeneral.cpp
+    ksettingsregisterdecl.ui
+    ksettingsregister.cpp
+    ksettingsgpgdecl.ui
+    ksettingsgpg.cpp
+    ksettingscolorsdecl.ui
+    ksettingscolors.cpp
+    ksettingsfontsdecl.ui
+    ksettingsfonts.cpp
+    ksettingsschedulesdecl.ui
+    ksettingsschedules.cpp
+    ksettingsonlinequotesdecl.ui
+    ksettingsonlinequotes.cpp
+    ksettingshomedecl.ui
+    ksettingshome.cpp
+    ksettingsforecastdecl.ui
+    ksettingsforecast.cpp
+    ksettingsplugins.cpp
+
+  LINK
+    converter-static
+
+  DEPENDENCIES
+    kmm-includes
+)
diff --git a/kmymoney2/html/CMakeLists.txt b/kmymoney2/html/CMakeLists.txt
new file mode 100644
index 0000000..402ba4c
--- /dev/null
+++ b/kmymoney2/html/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_subdirectory( images )
+
+
+file( GLOB _pages RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" home*.html whats_new*.html *.css )
+list( SORT _pages )
+
+install(
+  FILES ${_pages}
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/html
+)
diff --git a/kmymoney2/html/images/CMakeLists.txt b/kmymoney2/html/images/CMakeLists.txt
new file mode 100644
index 0000000..3a1d948
--- /dev/null
+++ b/kmymoney2/html/images/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+file( GLOB _images RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.png *.gif )
+list( SORT _images )
+
+install(
+  FILES ${_images}
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/html/images
+)
diff --git a/kmymoney2/icons/CMakeLists.txt b/kmymoney2/icons/CMakeLists.txt
new file mode 100644
index 0000000..39f9ead
--- /dev/null
+++ b/kmymoney2/icons/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+file( GLOB _themes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
+list( SORT _themes )
+
+foreach( _theme IN LISTS _themes )
+  if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_theme} )
+    list( REMOVE_ITEM _themes "${_theme}" )
+  endif()
+endforeach()
+
+install(
+   DIRECTORY ${_themes}
+   DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/icons
+   FILES_MATCHING
+     PATTERN "*.gif"
+     PATTERN "*.png"
+     PATTERN "*.svgz"
+)
diff --git a/kmymoney2/misc/CMakeLists.txt b/kmymoney2/misc/CMakeLists.txt
new file mode 100644
index 0000000..a9e77a6
--- /dev/null
+++ b/kmymoney2/misc/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+install(
+  FILES financequote.pl
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/misc
+)
diff --git a/kmymoney2/mymoney/CMakeLists.txt b/kmymoney2/mymoney/CMakeLists.txt
new file mode 100644
index 0000000..45c92c7
--- /dev/null
+++ b/kmymoney2/mymoney/CMakeLists.txt
@@ -0,0 +1,134 @@
+
+add_subdirectory( storage )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kmm_mymoney (static) ######################
+
+tde_add_library( kmm_mymoney STATIC_PIC AUTOMOC
+  SOURCES
+    mymoneymoney.cpp
+    mymoneyfinancialcalculator.cpp
+    mymoneytransactionfilter.cpp
+    mymoneyobject.cpp
+    mymoneykeyvaluecontainer.cpp
+    mymoneyobserver.cpp
+    mymoneysubject.cpp
+    mymoneysplit.cpp
+    mymoneyinstitution.cpp
+    mymoneyexception.cpp
+    mymoneyinvesttransaction.cpp
+    mymoneyutils.cpp
+    mymoneysecurity.cpp
+    mymoneytransaction.cpp
+    mymoneyscheduled.cpp
+    mymoneypayee.cpp
+    mymoneyfile.cpp
+    mymoneycategory.cpp
+    mymoneyaccount.cpp
+    mymoneyreport.cpp
+    mymoneystatement.cpp
+    mymoneyprice.cpp
+    mymoneybudget.cpp
+    mymoneyobjectcontainer.cpp
+    mymoneyforecast.cpp
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### kmm_mymoney (shared) ######################
+
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
+
+tde_add_library( kmm_mymoney SHARED AUTOMOC
+  SOURCES
+    dummy.cpp
+
+  VERSION 5.0.0
+
+  EMBED
+    kmm_mymoney-static
+
+  LINK
+    kmymoneysettings-static
+    storage-static
+    tdecore-shared
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### mymoneytest (static)
+
+tde_add_library( mymoneytest STATIC_PIC AUTOMOC
+  SOURCES
+    mymoneytransactiontest.cpp
+    mymoneysplittest.cpp
+    mymoneymoneytest.cpp
+    mymoneyfiletest.cpp
+    mymoneyaccounttest.cpp
+    mymoneyexceptiontest.cpp
+    mymoneyinstitutiontest.cpp
+    mymoneykeyvaluecontainertest.cpp
+    mymoneyscheduletest.cpp
+    mymoneyfinancialcalculatortest.cpp
+    mymoneysecuritytest.cpp
+    mymoneypricetest.cpp
+    mymoneyobjecttest.cpp
+    mymoneyforecasttest.cpp
+    mymoneypayeetest.cpp
+
+  DEPENDENCIES
+    kmm-includes
+
+  EXCLUDE_FROM_ALL
+)
+
+
+##### other data
+
+kmm_install_includes(
+  FILES
+    mymoneyobject.h
+    mymoneyaccount.h
+    mymoneycategory.h
+    mymoneyexception.h
+    mymoneyfile.h
+    mymoneyfinancialcalculator.h
+    mymoneyinstitution.h
+    mymoneyinvesttransaction.h
+    mymoneykeyvaluecontainer.h
+    mymoneymoney.h
+    mymoneyobserver.h
+    mymoneypayee.h
+    mymoneyprice.h
+    mymoneyreport.h
+    mymoneyscheduled.h
+    mymoneysecurity.h
+    mymoneysplit.h
+    mymoneystatement.h
+    mymoneysubject.h
+    mymoneytransactionfilter.h
+    mymoneytransaction.h
+    mymoneyutils.h
+    mymoneybudget.h
+    mymoneyobjectcontainer.h
+    mymoneyforecast.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/mymoney/mymoneymoneytest.cpp b/kmymoney2/mymoney/mymoneymoneytest.cpp
index 116cee9..58173dc 100644
--- a/kmymoney2/mymoney/mymoneymoneytest.cpp
+++ b/kmymoney2/mymoney/mymoneymoneytest.cpp
@@ -30,9 +30,9 @@
 
 // make sure, we have the correct suffix
 #if SIZEOF_LONG == 8
-#define LLCONST(a) a ## L
+#define LLCONST(a) (signed64)a ## L
 #else
-#define LLCONST(a) a ## LL
+#define LLCONST(a) (signed64)a ## LL
 #endif
 
 MyMoneyMoneyTest::MyMoneyMoneyTest()
diff --git a/kmymoney2/mymoney/storage/CMakeLists.txt b/kmymoney2/mymoney/storage/CMakeLists.txt
new file mode 100644
index 0000000..ceb29ba
--- /dev/null
+++ b/kmymoney2/mymoney/storage/CMakeLists.txt
@@ -0,0 +1,63 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### storage (static)
+
+tde_add_library( storage STATIC_PIC AUTOMOC
+  SOURCES
+    imymoneystorageformat.cpp
+    mymoneystoragexml.cpp
+    mymoneystoragedump.cpp
+    mymoneyseqaccessmgr.cpp
+    mymoneydatabasemgr.cpp
+    imymoneystorage.cpp
+    imymoneyserialize.cpp
+    mymoneystorageanon.cpp
+    mymoneystoragesql.cpp
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### storagetest (static)
+
+tde_add_library( storagetest STATIC_PIC AUTOMOC
+  SOURCES
+    mymoneyseqaccessmgrtest.cpp
+    mymoneymaptest.cpp
+    mymoneydatabasemgrtest.cpp
+
+  LINK
+    storage-static
+
+  DEPENDENCIES
+    kmm-includes
+
+  EXCLUDE_FROM_ALL
+)
+
+
+##### other data
+
+kmm_install_includes(
+  FILES
+    imymoneystorage.h
+    imymoneyserialize.h
+    imymoneystorageformat.h
+    mymoneystoragesql.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index dd8c6e8..08403f2 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -20,6 +20,7 @@
 
 #include "mymoneydatabasemgrtest.h"
 #include <pwd.h>
+#include <unistd.h>
 #include <iostream>
 
 MyMoneyDatabaseMgrTest::MyMoneyDatabaseMgrTest()
diff --git a/kmymoney2/pics/CMakeLists.txt b/kmymoney2/pics/CMakeLists.txt
index 6723c09..b17545a 100644
--- a/kmymoney2/pics/CMakeLists.txt
+++ b/kmymoney2/pics/CMakeLists.txt
@@ -1,16 +1,7 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
 
+##### icons
 
-########### install files ###############
-
-INSTALL(FILES  startlogo.png  titlelabel_background.png 
-	DESTINATION share/apps/kmymoney2/pics/ 
+install(
+  FILES startlogo.png titlelabel_background.png
+  DESTINATION ${DATA_INSTALL_DIR}/kmymoney2/pics
 )
-
-
-
-#original Makefile.am contents follow:
-
-#kmymoneydir = $(kde_datadir)/kmymoney2/pics/
-#kmymoney_DATA = startlogo.png  titlelabel_background.png 
-#
diff --git a/kmymoney2/plugins/CMakeLists.txt b/kmymoney2/plugins/CMakeLists.txt
new file mode 100644
index 0000000..97adc11
--- /dev/null
+++ b/kmymoney2/plugins/CMakeLists.txt
@@ -0,0 +1,58 @@
+
+add_subdirectory( interfaces )
+tde_conditional_add_subdirectory( WITH_LIBOFX ofximport )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kmm_plugin (shared)
+
+tde_add_library( kmm_plugin SHARED AUTOMOC
+  SOURCES
+    kmymoneyplugin.cpp
+    pluginloader.cpp
+    viewinterface.cpp
+    statementinterface.cpp
+    importinterface.cpp
+
+  VERSION 0.0.0
+
+  LINK
+    tdecore-shared tdeutils-shared
+
+  DEPENDENCIES
+    kmm-includes
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+  SOURCE kmymoneyplugin.desktop kmymoneyimporterplugin.desktop
+  DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+kmm_install_includes(
+  FILES
+    kmymoneyplugin.h
+    pluginloader.h
+    viewinterface.h
+    statementinterface.h
+    importinterface.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/plugins/interfaces/CMakeLists.txt b/kmymoney2/plugins/interfaces/CMakeLists.txt
new file mode 100644
index 0000000..242776d
--- /dev/null
+++ b/kmymoney2/plugins/interfaces/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### interfaces (static)
+
+tde_add_library( interfaces STATIC_PIC AUTOMOC
+  SOURCES
+    kmmviewinterface.cpp
+    kmmstatementinterface.cpp
+    kmmimportinterface.cpp
+
+  DEPENDENCIES
+    kmm-includes
+)
diff --git a/kmymoney2/plugins/ofximport/CMakeLists.txt b/kmymoney2/plugins/ofximport/CMakeLists.txt
new file mode 100644
index 0000000..906b919
--- /dev/null
+++ b/kmymoney2/plugins/ofximport/CMakeLists.txt
@@ -0,0 +1,52 @@
+
+add_subdirectory( dialogs )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/dialogs
+  ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kmm_ofximport (kpart)
+
+tde_add_kpart( kmm_ofximport AUTOMOC
+  SOURCES
+    ofximporterplugin.cpp
+    ofxpartner.cpp
+
+  LINK
+    ofximport-dialogs-static
+    kmm_plugin-shared kmm_mymoney-shared
+    tdecore-shared tdeui-shared tdeio-shared tdehtml-shared
+    ${LIBOFX_LIBRARIES}
+
+  DEPENDENCIES
+    kmm-includes
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+  FILES kmm_ofximport.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kmm_ofximport
+)
+
+tde_create_translated_desktop(
+  SOURCE kmm_ofximport.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kmymoney2/plugins/ofximport/dialogs/CMakeLists.txt b/kmymoney2/plugins/ofximport/dialogs/CMakeLists.txt
new file mode 100644
index 0000000..5fede97
--- /dev/null
+++ b/kmymoney2/plugins/ofximport/dialogs/CMakeLists.txt
@@ -0,0 +1,31 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### ofximport-dialogs (static)
+
+tde_add_library( ofximport-dialogs STATIC_PIC AUTOMOC
+  SOURCES
+    konlinebankingsetupdecl.ui
+    konlinebankingstatusdecl.ui
+    konlinebankingsetupwizard.cpp
+    konlinebankingstatus.cpp
+    kofxdirectconnectdlgdecl.ui
+    kofxdirectconnectdlg.cpp
+    mymoneyofxconnector.cpp
+
+  DEPENDENCIES
+    kmm-includes
+)
diff --git a/kmymoney2/reports/CMakeLists.txt b/kmymoney2/reports/CMakeLists.txt
new file mode 100644
index 0000000..70ab830
--- /dev/null
+++ b/kmymoney2/reports/CMakeLists.txt
@@ -0,0 +1,55 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_SOURCE_DIR}/libkdchart
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### reports (static)
+
+tde_add_library( reports STATIC_PIC AUTOMOC
+  SOURCES
+    pivotgrid.cpp
+    pivottable.cpp
+    listtable.cpp
+    querytable.cpp
+    objectinfotable.cpp
+    reportaccount.cpp
+    kreportchartview.cpp
+
+  LINK
+    kmymoneysettings-static
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### reportstest (static)
+
+tde_add_library( reportstest STATIC_PIC AUTOMOC
+  SOURCES
+    reportstestcommon.cpp
+    pivottabletest.cpp
+    pivotgridtest.cpp
+    querytabletest.cpp
+
+  LINK
+    reports-static
+    kmm_kdchart-shared
+
+  DEPENDENCIES
+    kmm-includes
+
+  EXCLUDE_FROM_ALL
+)
diff --git a/kmymoney2/templates/CMakeLists.txt b/kmymoney2/templates/CMakeLists.txt
deleted file mode 100644
index 11f53f1..0000000
--- a/kmymoney2/templates/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-########### install files ###############
-
-INSTALL(DIRECTORY
-  C de_AT de_CH de_DE dk el_GR en_GB en_US es_AR es_ES es_MX fr_CA
-  fr_CH fr_FR gl_ES hu_HU it jp nl_NL pt_BR pt_PT ro_RO ru_RU sk tr_TR
-  zh_CN zh_HK zh_TW
-  DESTINATION share/apps/kmymoney2/templates
-  PATTERN "CVS" EXCLUDE
-  PATTERN ".cvsignore" EXCLUDE
-  PATTERN "*Make*" EXCLUDE
-  )
diff --git a/kmymoney2/templates/cpp_template b/kmymoney2/templates/cpp_template
deleted file mode 100644
index 6bca001..0000000
--- a/kmymoney2/templates/cpp_template
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
-                          |FILENAME|  -  description
-                             -------------------
-    begin                : |DATE|
-    copyright            : (C) 2000-|YEAR| by |AUTHOR|
-    email                : |EMAIL|
-                           Javier Campos Morales <javi_c@users.sourceforge.net>
-                           Felix Rodriguez <frodriguez@users.sourceforge.net>
-                           John C <thetacoturtle@users.sourceforge.net>
-                           Thomas Baumgart <ipwizard@users.sourceforge.net>
-                           Kevin Tambascio <ktambascio@users.sourceforge.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 option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-// ----------------------------------------------------------------------------
-// QT Includes
-
-// ----------------------------------------------------------------------------
-// KDE Includes
-
-// ----------------------------------------------------------------------------
-// Project Includes
-
diff --git a/kmymoney2/templates/en_US/CMakeLists.txt b/kmymoney2/templates/en_US/CMakeLists.txt
deleted file mode 100644
index 553d99e..0000000
--- a/kmymoney2/templates/en_US/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
-
-########### install files ###############
-
-INSTALL(FILES  old-default_accounts.kmt default_categories-template.kmt ScheduleC_business.kmt ScheduleE_rental-property.kmt
-	DESTINATION share/apps/kmymoney2/templates/en_US  
-)
-
-
-
-#original Makefile.am contents follow:
-
-#templatedir=$(kde_datadir)/kmymoney2/templates/en_US
-#template_DATA = old-default_accounts.kmt default_categories-template.kmt ScheduleC_business.kmt ScheduleE_rental-property.kmt
-#
-#EXTRA_DIST = $(template_DATA)
diff --git a/kmymoney2/templates/header_template b/kmymoney2/templates/header_template
deleted file mode 100644
index 18f3519..0000000
--- a/kmymoney2/templates/header_template
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
-                          |FILENAME|  -  description
-                             -------------------
-    begin                : |DATE|
-    copyright            : (C) 2000-|YEAR| by |AUTHOR|
-    email                : |EMAIL|
-                           Javier Campos Morales <javi_c@users.sourceforge.net>
-                           Felix Rodriguez <frodriguez@users.sourceforge.net>
-                           John C <thetacoturtle@users.sourceforge.net>
-                           Thomas Baumgart <ipwizard@users.sourceforge.net>
-                           Kevin Tambascio <ktambascio@users.sourceforge.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 option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-// ----------------------------------------------------------------------------
-// QT Includes
-
-// ----------------------------------------------------------------------------
-// KDE Includes
-
-// ----------------------------------------------------------------------------
-// Project Includes
diff --git a/kmymoney2/views/CMakeLists.txt b/kmymoney2/views/CMakeLists.txt
new file mode 100644
index 0000000..4b2e8a0
--- /dev/null
+++ b/kmymoney2/views/CMakeLists.txt
@@ -0,0 +1,62 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_SOURCE_DIR}/libkdchart
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### views (static)
+
+tde_add_library( views STATIC_PIC AUTOMOC
+  SOURCES
+    kreportsview.cpp
+    kmymoneytransaction.cpp
+    kgloballedgerview.cpp
+    kmymoneyfile.cpp
+    kinvestmentlistitem.cpp
+    kinvestmentviewdecl.ui
+    kinvestmentview.cpp
+    kscheduledlistitem.cpp
+    kscheduledviewdecl.ui
+    kscheduledview.cpp
+    kpayeesview.cpp
+    kpayeesviewdecl.ui
+    khomeview.cpp
+    kcategoriesviewdecl.ui
+    kcategoriesview.cpp
+    kmymoneyview.cpp
+    kaccountsviewdecl.ui
+    kaccountsview.cpp
+    kinstitutionsviewdecl.ui
+    kinstitutionsview.cpp
+    kbudgetview.cpp
+    kbudgetviewdecl.ui
+    kforecastview.cpp
+    kforecastviewdecl.ui
+
+  LINK
+    dialogs-static
+    reports-static
+    storage-static
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### other data
+
+kmm_install_includes(
+  FILES kmymoneyview.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/widgets/CMakeLists.txt b/kmymoney2/widgets/CMakeLists.txt
new file mode 100644
index 0000000..9396313
--- /dev/null
+++ b/kmymoney2/widgets/CMakeLists.txt
@@ -0,0 +1,205 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### generate kmmwidgets.cpp
+
+add_custom_command(
+  OUTPUT kmmwidgets.cpp
+  COMMENT "Generating kmymoney2/widgets/kmmwidgets.cpp"
+  COMMAND ${KDE3_MAKETDEWIDGETS_EXECUTABLE}
+    -g KMyMoney -n CustomWidgetPlugin -o kmmwidgets.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.widgets
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.widgets
+)
+
+
+##### widgets (static)
+
+tde_add_library( widgets STATIC_PIC AUTOMOC
+  SOURCES
+    kbudgetvalues.cpp
+    kbudgetvaluesdecl.ui
+    kguiutils.cpp
+    tdelistviewsearchline.cpp
+    kmymoneyaccountcombo.cpp
+    kmymoneyaccountcompletion.cpp
+    kmymoneyaccountselector.cpp
+    kmymoneyaccounttreebase.cpp
+    kmymoneyaccounttree.cpp
+    kmymoneyaccounttreebudget.cpp
+    kmymoneyaccounttreeforecast.cpp
+    kmymoneybriefschedule.cpp
+    kmymoneycalculator.cpp
+    kmymoneycalendar.cpp
+    kmymoneycategory.cpp
+    kmymoneychecklistitem.cpp
+    kmymoneycombo.cpp
+    kmymoneycompletion.cpp
+    kmymoneycurrencyselector.cpp
+    kmymoneydateinput.cpp
+    kmymoneydatetbl.cpp
+    kmymoneyedit.cpp
+    kmymoneyforecastlistviewitem.cpp
+    kmymoneygpgconfig.cpp
+    kmymoneygpgconfigdecl.ui
+    kmymoneylineedit.cpp
+    kmymoneylistviewitem.cpp
+    kmymoneyonlinequoteconfig.cpp
+    kmymoneyonlinequoteconfigdecl.ui
+    kmymoneypriceview.cpp
+    kmymoneyreportconfigtab1decl.ui
+    kmymoneyreportconfigtab2decl.ui
+    kmymoneyreportconfigtab3decl.ui
+    kmymoneyreportconfigtabchartdecl.ui
+    kmymoneyreportcontroldecl.ui
+    kmymoneyscheduledcalendar.cpp
+    kmymoneyscheduleddatetbl.cpp
+    kmymoneyselector.cpp
+    kmymoneytitlelabel.cpp
+    kmymoneywizard.cpp
+    kschedulebriefwidget.ui
+    register.cpp
+    registeritem.cpp
+    registersearchline.cpp
+    transaction.cpp
+    scheduledtransaction.cpp
+    stdtransactiondownloaded.cpp
+    stdtransactionmatched.cpp
+    transactioneditorcontainer.cpp
+    transactionform.cpp
+    kaccounttemplateselectordecl.ui
+    kaccounttemplateselector.cpp
+    transactionsortoption.ui
+    selectedtransaction.cpp
+
+  LINK
+    tdeui-shared
+
+  DEPENDENCIES
+    kmm-includes
+)
+
+
+##### kmymoney (shared)
+
+if( BUILD_DESIGNER_PLUGIN )
+
+  tde_add_library( kmymoney SHARED AUTOMOC
+    SOURCES
+      kmymoneycompletion.cpp
+      kmymoneyaccountcombo.cpp
+      kmymoneyaccountcompletion.cpp
+      kmymoneycurrencyselector.cpp
+      kmymoneyaccountselector.cpp
+      kmymoneydatetbl.cpp
+      kmymoneycalculator.cpp
+      kmymoneycategory.cpp
+      kmymoneycombo.cpp
+      kmymoneylineedit.cpp
+      kmymoneyedit.cpp
+      kmymoneydateinput.cpp
+      kmymoneyaccounttree.cpp
+      kmymoneytitlelabel.cpp
+      kguiutils.cpp
+      kmymoneyaccounttreebase.cpp
+      kmymoneyaccounttreebudget.cpp
+      kmymoneyaccounttreeforecast.cpp
+      register.cpp
+      registeritem.cpp
+      transaction.cpp
+      scheduledtransaction.cpp
+      selectedtransaction.cpp
+      stdtransactiondownloaded.cpp
+      stdtransactionmatched.cpp
+      transactionform.cpp
+      kmymoneychecklistitem.cpp
+      kmymoneylistviewitem.cpp
+      kmymoneyselector.cpp
+      kbudgetvalues.cpp
+      kaccounttemplateselector.cpp
+
+      ${CMAKE_CURRENT_BINARY_DIR}/kbudgetvaluesdecl.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/kaccounttemplateselectordecl.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/kmmwidgets.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/transactionsortoption.cpp
+
+      void-timetrace.cpp
+
+    LINK
+      kmymoneysettings-static
+      kmm_mymoney-static
+      kmm_kdchart-static
+      converter-static
+      dialogs-static
+      reports-static
+      storage-static
+      tdecore-shared tdeui-shared tdeio-shared
+
+    DEPENDENCIES
+      kmm-includes
+
+    DESTINATION "${TQT_PLUGINS_DIR}/designer"
+  )
+
+  # Make sure to compile the TQt designer version.
+  set_property(
+    TARGET kmymoney-shared
+    APPEND PROPERTY COMPILE_DEFINITIONS KMM_DESIGNER
+  )
+
+endif()
+
+
+##### other data
+
+kmm_install_includes(
+  FILES
+    kmymoneydateinput.h
+    kmymoneyedit.h
+    kmymoneytitlelabel.h
+    kmymoneyaccountselector.h
+    kmymoneycategory.h
+    kmymoneyaccounttreebase.h
+    kmymoneyaccounttree.h
+    kmymoneycurrencyselector.h
+    kguiutils.h
+    kmymoneywizard.h
+    kmymoneyaccounttreebudget.h
+    kmymoneyaccounttreeforecast.h
+    kmymoneyaccountcombo.h
+    register.h
+    registeritem.h
+    transaction.h
+    scheduledtransaction.h
+    stdtransactiondownloaded.h
+    stdtransactionmatched.h
+    selectedtransaction.h
+    transactionform.h
+    transactioneditorcontainer.h
+    kmymoneylineedit.h
+    kmymoneychecklistitem.h
+    kmymoneylistviewitem.h
+    kmymoneyforecastlistviewitem.h
+    kmymoneyselector.h
+    kmymoneyaccountcompletion.h
+    kmymoneycompletion.h
+    kmymoneycombo.h
+    kbudgetvalues.h
+    kaccounttemplateselector.h
+    ${CMAKE_CURRENT_BINARY_DIR}/kbudgetvaluesdecl.h
+    ${CMAKE_CURRENT_BINARY_DIR}/transactionsortoption.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney
+)
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index d8cdd0e..395b329 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -377,4 +377,4 @@ void KMyMoneyWizard::accept(void)
 }
 
 #include "kmymoneywizard.moc"
-
+#include "kmymoneywizard_p.moc"
diff --git a/kmymoney2/widgets/void-timetrace.cpp b/kmymoney2/widgets/void-timetrace.cpp
new file mode 100644
index 0000000..3d19076
--- /dev/null
+++ b/kmymoney2/widgets/void-timetrace.cpp
@@ -0,0 +1,5 @@
+// required for the testcases, not used in TQt Designer plugin
+void timetrace(const char *txt)
+{
+  Q_UNUSED(txt);
+}
diff --git a/kmymoney2/wizards/CMakeLists.txt b/kmymoney2/wizards/CMakeLists.txt
new file mode 100644
index 0000000..409ee6f
--- /dev/null
+++ b/kmymoney2/wizards/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_subdirectory( wizardpages )
+add_subdirectory( newuserwizard )
+add_subdirectory( newaccountwizard )
diff --git a/kmymoney2/wizards/newaccountwizard/CMakeLists.txt b/kmymoney2/wizards/newaccountwizard/CMakeLists.txt
new file mode 100644
index 0000000..c937131
--- /dev/null
+++ b/kmymoney2/wizards/newaccountwizard/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/..
+  ${CMAKE_CURRENT_BINARY_DIR}/../wizardpages
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### newaccountwizard (static)
+
+tde_add_library( newaccountwizard STATIC_PIC AUTOMOC
+  SOURCES
+    knewaccountwizard.cpp
+    kinstitutionpagedecl.ui
+    kaccounttypepagedecl.ui
+    kbrokeragepagedecl.ui
+    kschedulepagedecl.ui
+    kgeneralloaninfopagedecl.ui
+    kloandetailspagedecl.ui
+    kloanpaymentpagedecl.ui
+    kloanschedulepagedecl.ui
+    kloanpayoutpagedecl.ui
+    khierarchypagedecl.ui
+    kaccountsummarypagedecl.ui
+
+  DEPENDENCIES
+    kmm-includes
+    dialogs-static
+)
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index 9e68171..377615a 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -1693,3 +1693,4 @@ void AccountSummaryPage::enterPage(void)
 }
 
 #include "knewaccountwizard.moc"
+#include "knewaccountwizard_p.moc"
diff --git a/kmymoney2/wizards/newuserwizard/CMakeLists.txt b/kmymoney2/wizards/newuserwizard/CMakeLists.txt
new file mode 100644
index 0000000..5a0d0f2
--- /dev/null
+++ b/kmymoney2/wizards/newuserwizard/CMakeLists.txt
@@ -0,0 +1,33 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/../wizardpages
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### newusertwizard (static)
+
+tde_add_library( newuserwizard STATIC_PIC AUTOMOC
+  SOURCES
+    knewuserwizard.cpp
+    kgeneralpagedecl.ui
+    kcurrencypagedecl.ui
+    kpasswordpagedecl.ui
+    kaccountpagedecl.ui
+    kpreferencepagedecl.ui
+    tdefilepagedecl.ui
+    kintropagedecl.ui
+
+  DEPENDENCIES
+    kmm-includes
+)
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index 01b6155..abeb567 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -365,3 +365,4 @@ bool FilePage::isComplete(void) const
 }
 
 #include "knewuserwizard.moc"
+#include "knewuserwizard_p.moc"
diff --git a/kmymoney2/wizards/wizardpages/CMakeLists.txt b/kmymoney2/wizards/wizardpages/CMakeLists.txt
new file mode 100644
index 0000000..6b4772c
--- /dev/null
+++ b/kmymoney2/wizards/wizardpages/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### wizardpages (static)
+
+tde_add_library( wizardpages STATIC_PIC AUTOMOC
+  SOURCES
+    userinfodecl.ui
+    userinfo.cpp
+    currencydecl.ui
+    currency.cpp
+    accountsdecl.ui
+    accounts.cpp
+
+  DEPENDENCIES
+    kmm-includes
+)