4 files changed, 200 insertions, 2 deletions
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()