4 files changed, 207 insertions, 11 deletions
diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt
new file mode 100644
index 00000000..c147f80a
--- /dev/null
+++ b/libkcddb/CMakeLists.txt
@@ -0,0 +1,56 @@
+#################################################
+#
+#  (C) 2017 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( kcmcddb )
+add_subdirectory( test )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kcddb (library) ###########################
+
+tde_add_library( kcddb SHARED AUTOMOC
+  SOURCES
+    cache.cpp cdinfo.cpp config.cpp client.cpp cddb.cpp lookup.cpp
+    cddbplookup.cpp synccddbplookup.cpp asynccddbplookup.cpp httplookup.cpp
+    synchttplookup.cpp asynchttplookup.cpp smtpsubmit.cpp
+    asyncsmtpsubmit.cpp syncsmtpsubmit.cpp configbase.kcfgc
+    submit.cpp sites.cpp httpsubmit.cpp asynchttpsubmit.cpp
+    synchttpsubmit.cpp cdinfodialogbase.ui categories.cpp genres.cpp
+    cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
+  VERSION 1.0.0
+  LINK
+    tdecore-shared tdeio-shared tdeui-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data ################################
+
+install(
+  FILES
+    cache.h cdinfo.h client.h config.h cddb.h
+    ${CMAKE_CURRENT_BINARY_DIR}/configbase.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkcddb
+)
+
+install(FILES libkcddb.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
diff --git a/libkcddb/kcmcddb/CMakeLists.txt b/libkcddb/kcmcddb/CMakeLists.txt
new file mode 100644
index 00000000..d94fa800
--- /dev/null
+++ b/libkcddb/kcmcddb/CMakeLists.txt
@@ -0,0 +1,42 @@
+#################################################
+#
+#  (C) 2017 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/..
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kcm_cddb (module) #########################
+
+tde_add_kpart( kcm_cddb AUTOMOC
+  SOURCES
+    cddbconfigwidgetbase.ui
+    cddbconfigwidget.cpp
+    kcmcddb.cpp
+  LINK
+    kcddb-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data ################################
+
+install( FILES libkcddb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcmcddb-emailsettings.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
diff --git a/libkcddb/test/CMakeLists.txt b/libkcddb/test/CMakeLists.txt
new file mode 100644
index 00000000..6f7da4b1
--- /dev/null
+++ b/libkcddb/test/CMakeLists.txt
@@ -0,0 +1,89 @@
+#################################################
+#
+#  (C) 2017 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/..
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### check programs ############################
+
+tde_add_check_executable( asyncsmtpsubmittest AUTOMOC
+  SOURCES asyncsmtpsubmittest.cpp
+  LINK kcddb-shared
+  TEST
+)
+
+
+tde_add_check_executable( syncsmtpsubmittest AUTOMOC
+  SOURCES syncsmtpsubmittest.cpp
+  LINK kcddb-shared
+)
+
+
+tde_add_check_executable( asynchttpsubmittest AUTOMOC
+  SOURCES asynchttpsubmittest.cpp
+  LINK kcddb-shared
+  TEST
+)
+
+
+tde_add_check_executable( synchttpsubmittest AUTOMOC
+  SOURCES synchttpsubmittest.cpp
+  LINK kcddb-shared
+)
+
+
+tde_add_check_executable( asynchttplookuptest AUTOMOC
+  SOURCES asynchttplookuptest.cpp
+  LINK kcddb-shared
+  TEST
+)
+
+
+tde_add_check_executable( asynccddblookuptest AUTOMOC
+  SOURCES asynccddblookuptest.cpp
+  LINK kcddb-shared
+  TEST
+)
+
+
+tde_add_check_executable( synchttplookuptest AUTOMOC
+  SOURCES synchttplookuptest.cpp
+  LINK kcddb-shared
+)
+
+
+tde_add_check_executable( synccddblookuptest AUTOMOC
+  SOURCES synccddblookuptest.cpp
+  LINK kcddb-shared
+)
+
+
+tde_add_check_executable( utf8test AUTOMOC
+  SOURCES utf8test.cpp
+  LINK kcddb-shared
+)
+
+
+tde_add_check_executable( sitestest AUTOMOC
+  SOURCES sitestest.cpp
+  LINK kcddb-shared
+)
diff --git a/libkcddb/test/Makefile.am b/libkcddb/test/Makefile.am
index ab814db4..320b5902 100644
--- a/libkcddb/test/Makefile.am
+++ b/libkcddb/test/Makefile.am
@@ -6,43 +6,52 @@ check_PROGRAMS = syncsmtpsubmittest asyncsmtpsubmittest asynchttplookuptest \
 
 syncsmtpsubmittest_SOURCES = syncsmtpsubmittest.cpp
 syncsmtpsubmittest_LDFLAGS = $(all_libraries)
-syncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+syncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 asyncsmtpsubmittest_SOURCES = asyncsmtpsubmittest.cpp
 asyncsmtpsubmittest_LDFLAGS = $(all_libraries)
-asyncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+asyncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 asynchttplookuptest_SOURCES = asynchttplookuptest.cpp
 asynchttplookuptest_LDFLAGS = $(all_libraries)
-asynchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+asynchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 asynccddblookuptest_SOURCES = asynccddblookuptest.cpp
 asynccddblookuptest_LDFLAGS = $(all_libraries)
-asynccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+asynccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 synchttplookuptest_SOURCES = synchttplookuptest.cpp
 synchttplookuptest_LDFLAGS = $(all_libraries)
-synchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+synchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 synccddblookuptest_SOURCES = synccddblookuptest.cpp
 synccddblookuptest_LDFLAGS = $(all_libraries)
-synccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+synccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 synchttpsubmittest_SOURCES = synchttpsubmittest.cpp
 synchttpsubmittest_LDFLAGS = $(all_libraries)
-synchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+synchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 asynchttpsubmittest_SOURCES = asynchttpsubmittest.cpp
 asynchttpsubmittest_LDFLAGS = $(all_libraries)
-asynchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+asynchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 utf8test_SOURCES = utf8test.cpp
 utf8test_LDFLAGS = $(all_libraries)
-utf8test_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+utf8test_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 sitestest_SOURCES = sitestest.cpp
 sitestest_LDFLAGS = $(all_libraries)
-sitestest_LDADD = $(top_builddir)/libkcddb/libkcddb.la
+sitestest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 
 METASOURCES = AUTO
-