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>

17 files changed, 126 insertions, 26 deletions

diff --git a/klatin/CMakeLists.txt b/klatin/CMakeLists.txt
new file mode 100644
index 00000000..2b7993ce
--- /dev/null
+++ b/klatin/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( klatin )
diff --git a/klatin/klatin/CMakeLists.txt b/klatin/klatin/CMakeLists.txt
new file mode 100644
index 00000000..f0094b17
--- /dev/null
+++ b/klatin/klatin/CMakeLists.txt
@@ -0,0 +1,61 @@
+add_subdirectory( data  )
+add_subdirectory( icons )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/libtdeedu/tdeeducore
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### klatin (executable)
+
+tde_add_executable( klatin AUTOMOC
+
+  SOURCES
+        klatinchoose.ui
+        klatingrammarwidget.ui
+        klatinvocabwidget.ui
+        klatinverbswidget.ui
+        klatinresultsdialog.ui
+        klatinsettings_vocabpage.ui
+        main.cpp
+        klatin.cpp
+        klatingrammar.cpp
+        klatinverbs.cpp
+        klatinvocab.cpp
+        settings.kcfgc
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeeducore-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES klatinui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klatin
+)
+
+install(
+    FILES klatin.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES klatin.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/klatin/klatin/data/CMakeLists.txt b/klatin/klatin/data/CMakeLists.txt
new file mode 100644
index 00000000..6d0aa9f3
--- /dev/null
+++ b/klatin/klatin/data/CMakeLists.txt
@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )
diff --git a/klatin/klatin/data/grammar/CMakeLists.txt b/klatin/klatin/data/grammar/CMakeLists.txt
new file mode 100644
index 00000000..81029b53
--- /dev/null
+++ b/klatin/klatin/data/grammar/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _klats RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.klat )
+
+install(
+    FILES ${_klats}
+  DESTINATION ${DATA_INSTALL_DIR}/klatin/data/grammar
+)
diff --git a/klatin/klatin/data/verbs/CMakeLists.txt b/klatin/klatin/data/verbs/CMakeLists.txt
new file mode 100644
index 00000000..37af2cfd
--- /dev/null
+++ b/klatin/klatin/data/verbs/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _klats RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.klat )
+
+install(
+    FILES ${_klats}
+  DESTINATION ${DATA_INSTALL_DIR}/klatin/data/verbs
+)
diff --git a/klatin/klatin/data/vocab/CMakeLists.txt b/klatin/klatin/data/vocab/CMakeLists.txt
new file mode 100644
index 00000000..6d0aa9f3
--- /dev/null
+++ b/klatin/klatin/data/vocab/CMakeLists.txt
@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )
diff --git a/klatin/klatin/data/vocab/de/CMakeLists.txt b/klatin/klatin/data/vocab/de/CMakeLists.txt
new file mode 100644
index 00000000..464b07b3
--- /dev/null
+++ b/klatin/klatin/data/vocab/de/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kvtmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvtml )
+
+install(
+    FILES ${_kvtmls}
+    DESTINATION ${DATA_INSTALL_DIR}/klatin/data/vocabs/de
+)
diff --git a/klatin/klatin/data/vocab/en/CMakeLists.txt b/klatin/klatin/data/vocab/en/CMakeLists.txt
new file mode 100644
index 00000000..7c27e17d
--- /dev/null
+++ b/klatin/klatin/data/vocab/en/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kvtmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvtml )
+
+install(
+    FILES ${_kvtmls}
+    DESTINATION ${DATA_INSTALL_DIR}/klatin/data/vocabs/en
+)
diff --git a/klatin/klatin/data/vocab/pl/CMakeLists.txt b/klatin/klatin/data/vocab/pl/CMakeLists.txt
new file mode 100644
index 00000000..d0c1f9cc
--- /dev/null
+++ b/klatin/klatin/data/vocab/pl/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kvtmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvtml )
+
+install(
+    FILES ${_kvtmls}
+    DESTINATION ${DATA_INSTALL_DIR}/klatin/data/vocabs/pl
+)
diff --git a/klatin/klatin/data/vocab/sk/CMakeLists.txt b/klatin/klatin/data/vocab/sk/CMakeLists.txt
new file mode 100644
index 00000000..44e515bf
--- /dev/null
+++ b/klatin/klatin/data/vocab/sk/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kvtmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kvtml )
+
+install(
+    FILES ${_kvtmls}
+    DESTINATION ${DATA_INSTALL_DIR}/klatin/data/vocabs/sk
+)
diff --git a/klatin/klatin/icons/CMakeLists.txt b/klatin/klatin/icons/CMakeLists.txt
new file mode 100644
index 00000000..63f765b3
--- /dev/null
+++ b/klatin/klatin/icons/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( )
diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui
index 36f0a6da..2528d52f 100644
--- a/klatin/klatin/klatinchoose.ui
+++ b/klatin/klatin/klatinchoose.ui
@@ -257,8 +257,7 @@ verb and noun tables</string>
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui
index 04dc1ca9..cc88a53b 100644
--- a/klatin/klatin/klatingrammarwidget.ui
+++ b/klatin/klatin/klatingrammarwidget.ui
@@ -376,7 +376,9 @@ Line 4</string>
     <tabstop>ChooseSection</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui
index 4de14db7..12effec6 100644
--- a/klatin/klatin/klatinresultsdialog.ui
+++ b/klatin/klatin/klatinresultsdialog.ui
@@ -217,7 +217,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui
index 45642614..1bf5c803 100644
--- a/klatin/klatin/klatinsettings_vocabpage.ui
+++ b/klatin/klatin/klatinsettings_vocabpage.ui
@@ -172,10 +172,10 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui
index 4cfd546e..93a217c0 100644
--- a/klatin/klatin/klatinverbswidget.ui
+++ b/klatin/klatin/klatinverbswidget.ui
@@ -420,7 +420,9 @@ Line 4</string>
     <tabstop>ChangeButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui
index 6fd39ff2..1fb026f3 100644
--- a/klatin/klatin/klatinvocabwidget.ui
+++ b/klatin/klatin/klatinvocabwidget.ui
@@ -382,11 +382,7 @@
     <tabstop>BackButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>