summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-07-04 18:35:40 +0200
committergregory guy <gregory-tde@laposte.net>2020-07-05 16:50:07 +0200
commit544a219d602129cf446659b2f56aeabee69d0182 (patch)
tree5a2a565a88b89afbdd67dd8ba74dc72446b9d968 /client
parent23c0ecabcb79e123a01b1f0d7e6fc7f02e0daf4e (diff)
downloadtde-style-domino-544a219d602129cf446659b2f56aeabee69d0182.tar.gz
tde-style-domino-544a219d602129cf446659b2f56aeabee69d0182.zip
Conversion to the cmake building system.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Diffstat (limited to 'client')
-rw-r--r--client/CMakeLists.txt42
-rw-r--r--client/config/CMakeLists.txt26
-rw-r--r--client/config/Makefile.am2
-rw-r--r--client/config/config.cpp4
-rw-r--r--client/config/dominoConfig.h (renamed from client/config/config.h)4
5 files changed, 75 insertions, 3 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
new file mode 100644
index 0000000..138918b
--- /dev/null
+++ b/client/CMakeLists.txt
@@ -0,0 +1,42 @@
+tde_import( twin )
+
+add_subdirectory( config )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${XCB_SHAPE_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIBRARY_DIRS}
+ ${XCB_SHAPE_LIBRARY_DIRS}
+)
+
+
+##### twin3_domino (kpart)
+
+tde_add_kpart( twin3_domino AUTOMOC
+
+ SOURCES
+ dominoclient.cpp
+ LINK
+ tdecore-shared
+ tdecorations-shared
+ ${X11_LIBRARIES}
+ ${XCB_SHAPE_LIBRARIES}
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES domino.desktop
+ DESTINATION ${DATA_INSTALL_DIR}/twin
+)
diff --git a/client/config/CMakeLists.txt b/client/config/CMakeLists.txt
new file mode 100644
index 0000000..e2193f8
--- /dev/null
+++ b/client/config/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}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIBRARY_DIRS}
+)
+
+
+##### twin_domino_config (kpart)
+
+tde_add_kpart( twin_domino_config AUTOMOC
+
+ SOURCES
+ config.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/client/config/Makefile.am b/client/config/Makefile.am
index 8831c43..0e0c631 100644
--- a/client/config/Makefile.am
+++ b/client/config/Makefile.am
@@ -7,4 +7,4 @@ twin_domino_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_domino_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
METASOURCES = AUTO
-noinst_HEADERS = config.h
+noinst_HEADERS = dominoConfig.h
diff --git a/client/config/config.cpp b/client/config/config.cpp
index 5dfffb2..48025ae 100644
--- a/client/config/config.cpp
+++ b/client/config/config.cpp
@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
+#include "dominoConfig.h"
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tqvbox.h>
@@ -284,5 +284,5 @@ void DominoConfig::loadButtonContourColors() {
}
-#include "config.moc"
+#include "dominoConfig.moc"
diff --git a/client/config/config.h b/client/config/dominoConfig.h
index e48e96e..6313d96 100644
--- a/client/config/config.h
+++ b/client/config/dominoConfig.h
@@ -23,6 +23,10 @@
#ifndef DOMINOCONFIG_H
#define DOMINOCONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <tqcheckbox.h>
#include <tdeconfig.h>
#include <tqvbox.h>