Conversion to the cmake building system.

Add includes to UI files to resolve FTBFS.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

8 files changed, 240 insertions, 3 deletions

diff --git a/libtdeedu/CMakeLists.txt b/libtdeedu/CMakeLists.txt
new file mode 100644
index 00000000..13286849
--- /dev/null
+++ b/libtdeedu/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory( tdeeducore )
+add_subdirectory( tdeeduui   )
+add_subdirectory( tdeeduplot )
+add_subdirectory( extdate    )
diff --git a/libtdeedu/extdate/CMakeLists.txt b/libtdeedu/extdate/CMakeLists.txt
new file mode 100644
index 00000000..8bc22f35
--- /dev/null
+++ b/libtdeedu/extdate/CMakeLists.txt
@@ -0,0 +1,65 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### extdate (shared)
+
+tde_add_library( extdate SHARED AUTOMOC
+
+  SOURCES
+        extdatetime.cpp
+        extcalendarsystem.cpp
+        extcalendarsystemgregorian.cpp
+        extdatetbl.cpp
+        extdatepicker.cpp
+        extdatetimeedit.cpp
+        extdatewidget.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     
+  VERSION 1.2.0
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### test_extdate (test)
+
+tde_add_check_executable( test_extdate AUTOMOC
+
+  SOURCES
+        test_extdate.cc
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     extdate-shared
+
+  TEST
+)
+
+
+##### test_extdatepicker (test)
+
+tde_add_check_executable( test_extdatepicker AUTOMOC
+
+  SOURCES
+        testwidget.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     extdate-shared
+)
diff --git a/libtdeedu/tdeeducore/CMakeLists.txt b/libtdeedu/tdeeducore/CMakeLists.txt
new file mode 100644
index 00000000..30531ffc
--- /dev/null
+++ b/libtdeedu/tdeeducore/CMakeLists.txt
@@ -0,0 +1,37 @@
+add_subdirectory( tests )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeeducore (shared)
+
+tde_add_library( tdeeducore SHARED AUTOMOC
+
+  SOURCES
+        keduvocdata.cpp
+  LINK
+     tdecore-shared
+     
+  VERSION 1.2.0
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES keduvocdata.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/libtdeedu
+)
diff --git a/libtdeedu/tdeeducore/tests/CMakeLists.txt b/libtdeedu/tdeeducore/tests/CMakeLists.txt
new file mode 100644
index 00000000..88d48601
--- /dev/null
+++ b/libtdeedu/tdeeducore/tests/CMakeLists.txt
@@ -0,0 +1,26 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/tdeeducore
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### loader (test)
+
+tde_add_check_executable( loader AUTOMOC
+
+  SOURCES
+        loader.cpp
+  LINK
+     tdeeducore-shared
+
+  TEST
+)
diff --git a/libtdeedu/tdeeduplot/CMakeLists.txt b/libtdeedu/tdeeduplot/CMakeLists.txt
new file mode 100644
index 00000000..1fa82598
--- /dev/null
+++ b/libtdeedu/tdeeduplot/CMakeLists.txt
@@ -0,0 +1,37 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeeduplot (shared)
+
+tde_add_library( tdeeduplot SHARED AUTOMOC
+
+  SOURCES
+        kplotobject.cpp
+        kplotaxis.cpp
+        kplotwidget.cpp
+  LINK
+     tdecore-shared
+     
+  VERSION 1.2.0
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kplotobject.h kplotaxis.h kplotwidget.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/libtdeedu
+)
diff --git a/libtdeedu/tdeeduui/CMakeLists.txt b/libtdeedu/tdeeduui/CMakeLists.txt
new file mode 100644
index 00000000..ae095223
--- /dev/null
+++ b/libtdeedu/tdeeduui/CMakeLists.txt
@@ -0,0 +1,42 @@
+add_subdirectory( tests )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeeduui (shared)
+
+tde_add_library( tdeeduui SHARED AUTOMOC
+
+  SOURCES
+        kedusimpleentrydlgForm.ui
+        kedusimpleentrydlg.cpp
+        tdeeduglossary.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     tdehtml-shared
+     
+  VERSION 3.0.5
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES tdeeduglossary.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/libtdeedu
+)
diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h
index a649112e..dcb510d4 100644
--- a/libtdeedu/tdeeduui/tdeeduglossary.h
+++ b/libtdeedu/tdeeduui/tdeeduglossary.h
@@ -34,7 +34,7 @@ class GlossaryItem;
  * This class stores all items to be displayed. It also
  * has access-methods to the items
  */
-class Glossary
+class KDE_EXPORT Glossary
 {
 	public:
 		Glossary();
@@ -176,7 +176,7 @@ class Glossary
  * a number of pictures or references associated to it.
  * These are stored as TQStringLists.
  */
-class GlossaryItem
+class KDE_EXPORT GlossaryItem
 {
 	public:
 		GlossaryItem(){}
@@ -237,7 +237,7 @@ class GlossaryItem
  * @author Pino Toscano
  * @author Carsten Niehaus
  */
-class GlossaryDialog : public KDialogBase
+class KDE_EXPORT GlossaryDialog : public KDialogBase
 {
 	Q_OBJECT
   
diff --git a/libtdeedu/tdeeduui/tests/CMakeLists.txt b/libtdeedu/tdeeduui/tests/CMakeLists.txt
new file mode 100644
index 00000000..eeb72a24
--- /dev/null
+++ b/libtdeedu/tdeeduui/tests/CMakeLists.txt
@@ -0,0 +1,26 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/tdeeduui
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### entrydialogs (test)
+
+tde_add_check_executable( entrydialogs AUTOMOC
+
+  SOURCES
+        entrydialogs.cpp
+  LINK
+     tdeeduui-shared
+
+  TEST
+)