From 6b3181cf92f1fc74da1e8a82f690a1526cb4e900 Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Sun, 29 Mar 2020 19:41:28 +0200
Subject: Conversion to the cmake building system. Added several man pages
 taken from the Debian packaging. Cleanup headers in ui files. Add png icons
 for mono theme.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gregory guy <gregory-tde@laposte.net>

cmake:
- Use tde_add_check_executable instead of a combination
of separate calls to tde_add_executable and add_test.
- Simplify the detection of time.h and sys/time.h headers.
- Refactor phrasebook files install, kmouth.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 kmousetool/CMakeLists.txt                 |  2 ++
 kmousetool/kmousetool/CMakeLists.txt      | 47 +++++++++++++++++++++++++++++++
 kmousetool/kmousetool/kmousetool.h        |  6 ++--
 kmousetool/kmousetool/kmousetoolui.ui     | 16 +++--------
 kmousetool/kmousetool/pics/CMakeLists.txt |  7 +++++
 5 files changed, 63 insertions(+), 15 deletions(-)
 create mode 100644 kmousetool/CMakeLists.txt
 create mode 100644 kmousetool/kmousetool/CMakeLists.txt
 create mode 100644 kmousetool/kmousetool/pics/CMakeLists.txt

(limited to 'kmousetool')

diff --git a/kmousetool/CMakeLists.txt b/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..00e90e5
--- /dev/null
+++ b/kmousetool/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( kmousetool )
diff --git a/kmousetool/kmousetool/CMakeLists.txt b/kmousetool/kmousetool/CMakeLists.txt
new file mode 100644
index 0000000..7b7df2d
--- /dev/null
+++ b/kmousetool/kmousetool/CMakeLists.txt
@@ -0,0 +1,47 @@
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR}
+  ${X11_XTest_INCLUDE_PATH}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kmousetool (executable)
+
+tde_add_executable( kmousetool AUTOMOC
+
+  SOURCES
+        kmousetoolui.ui
+        mtstroke.cpp
+        kmousetool.cpp
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     ${X11_LIBRARIES}
+     ${X11_XTest_LIB}
+     ${X11_Xext_LIB}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop( kmousetool.desktop )
+
+install(
+    FILES mousetool_tap.wav
+    DESTINATION ${DATA_INSTALL_DIR}/kmousetool/sounds
+)
diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h
index 818dadc..210aefb 100644
--- a/kmousetool/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool/kmousetool.h
@@ -22,12 +22,12 @@
 #ifndef KMOUSETOOL_H
 #define KMOUSETOOL_H
 
-#include <tqdir.h>
-
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#include <tqdir.h>
+
 #include "version.h"
 
 #include <tdeapplication.h>
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index 906160a..1d74de1 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -407,16 +407,8 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <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">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kmousetool/kmousetool/pics/CMakeLists.txt b/kmousetool/kmousetool/pics/CMakeLists.txt
new file mode 100644
index 0000000..d0623c7
--- /dev/null
+++ b/kmousetool/kmousetool/pics/CMakeLists.txt
@@ -0,0 +1,7 @@
+##### icons
+
+tde_install_icons(
+    DESTINATION ${DATA_INSTALL_DIR}/kmousetool/icons
+)
+
+tde_install_icons( kmousetool )
-- 
cgit v1.2.1