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>

14 files changed, 139 insertions, 6 deletions

diff --git a/klettres/CMakeLists.txt b/klettres/CMakeLists.txt
new file mode 100644
index 00000000..04bbdedb
--- /dev/null
+++ b/klettres/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( klettres )
diff --git a/klettres/klettres/CMakeLists.txt b/klettres/klettres/CMakeLists.txt
new file mode 100644
index 00000000..81039ffe
--- /dev/null
+++ b/klettres/klettres/CMakeLists.txt
@@ -0,0 +1,70 @@
+add_subdirectory( pics  )
+add_subdirectory( data  )
+add_subdirectory( icons )
+add_subdirectory( en    )
+add_subdirectory( fr    )
+
+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}
+)
+
+
+##### klettres (executable)
+
+tde_add_executable( klettres AUTOMOC
+
+  SOURCES
+        fontsdlg.ui
+        timerdlg.ui
+        klettres.cpp
+        klnewstuff.cpp
+        main.cpp
+        klettresview.cpp
+        soundfactory.cpp
+        timer.cpp
+        prefs.kcfgc
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdenewstuff-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+    FILES klettresui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/klettres
+)
+
+install(
+    FILES klettres.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES klettres.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
+
+install(
+    FILES klettresrc
+    DESTINATION ${CONFIG_INSTALL_DIR}
+)
diff --git a/klettres/klettres/data/CMakeLists.txt b/klettres/klettres/data/CMakeLists.txt
new file mode 100644
index 00000000..29734453
--- /dev/null
+++ b/klettres/klettres/data/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory( langs )
+
+##### other data
+
+install(
+    FILES sounds.xml
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/data
+)
diff --git a/klettres/klettres/data/langs/CMakeLists.txt b/klettres/klettres/data/langs/CMakeLists.txt
new file mode 100644
index 00000000..e60cebbf
--- /dev/null
+++ b/klettres/klettres/data/langs/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _txts RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.txt )
+list( REMOVE_ITEM _txts CMakeLists.txt )
+
+install(
+    FILES ${_txts}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres
+)
diff --git a/klettres/klettres/en/CMakeLists.txt b/klettres/klettres/en/CMakeLists.txt
new file mode 100644
index 00000000..f0006a90
--- /dev/null
+++ b/klettres/klettres/en/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory( alpha  )
+add_subdirectory( syllab )
+
+install(
+    FILES sounds.xml
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/en
+)
diff --git a/klettres/klettres/en/alpha/CMakeLists.txt b/klettres/klettres/en/alpha/CMakeLists.txt
new file mode 100644
index 00000000..4db5cba0
--- /dev/null
+++ b/klettres/klettres/en/alpha/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _oggs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ogg )
+
+install(
+    FILES ${_oggs}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/en/alpha
+)
diff --git a/klettres/klettres/en/syllab/CMakeLists.txt b/klettres/klettres/en/syllab/CMakeLists.txt
new file mode 100644
index 00000000..c9d47dbb
--- /dev/null
+++ b/klettres/klettres/en/syllab/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _oggs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ogg )
+
+install(
+    FILES ${_oggs}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/en/syllab
+)
diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui
index 6bb42517..f98b6fc0 100644
--- a/klettres/klettres/fontsdlg.ui
+++ b/klettres/klettres/fontsdlg.ui
@@ -32,7 +32,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontdialog.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontdialog.h</include>
+</includes>
 </UI>
diff --git a/klettres/klettres/fr/CMakeLists.txt b/klettres/klettres/fr/CMakeLists.txt
new file mode 100644
index 00000000..0ef0dddc
--- /dev/null
+++ b/klettres/klettres/fr/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory( alpha  )
+add_subdirectory( syllab )
+
+install(
+    FILES sounds.xml
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/fr
+)
diff --git a/klettres/klettres/fr/alpha/CMakeLists.txt b/klettres/klettres/fr/alpha/CMakeLists.txt
new file mode 100644
index 00000000..cf7cd75c
--- /dev/null
+++ b/klettres/klettres/fr/alpha/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _oggs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ogg )
+
+install(
+    FILES ${_oggs}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/fr/alpha
+)
diff --git a/klettres/klettres/fr/syllab/CMakeLists.txt b/klettres/klettres/fr/syllab/CMakeLists.txt
new file mode 100644
index 00000000..f1484e67
--- /dev/null
+++ b/klettres/klettres/fr/syllab/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _oggs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ogg )
+
+install(
+    FILES ${_oggs}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/fr/syllab
+)
diff --git a/klettres/klettres/icons/CMakeLists.txt b/klettres/klettres/icons/CMakeLists.txt
new file mode 100644
index 00000000..d8a3e5f6
--- /dev/null
+++ b/klettres/klettres/icons/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/klettres/icons )
diff --git a/klettres/klettres/pics/CMakeLists.txt b/klettres/klettres/pics/CMakeLists.txt
new file mode 100644
index 00000000..0ecbefb9
--- /dev/null
+++ b/klettres/klettres/pics/CMakeLists.txt
@@ -0,0 +1,8 @@
+file( GLOB _pics RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.jpeg *.png )
+
+list( REMOVE_ITEM _pics menubar.png )
+
+install(
+    FILES ${_pics}
+    DESTINATION ${DATA_INSTALL_DIR}/klettres/pics
+)
diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui
index 82637661..fe2a19b8 100644
--- a/klettres/klettres/timerdlg.ui
+++ b/klettres/klettres/timerdlg.ui
@@ -239,7 +239,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
 </UI>