From 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 Mon Sep 17 00:00:00 2001
From: gregory guy <g-gregory@gmx.fr>
Date: Fri, 28 Jun 2019 15:14:51 +0200
Subject: Conversion to the cmake building system. Delete empty files
 (dummy.cpp, xsldbgconfig.h). Remove hard-coded path for the kmdr-executor
 executable. Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
 Add man pages taken from the Debian packaging.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Fix linking - kxsldbgcommon-static and  kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 kommander/widget/CMakeLists.txt     | 46 +++++++++++++++++++++++++++++++++++++
 kommander/widget/kmdrmainwindow.cpp |  5 ++++
 kommander/widget/kmdrmainwindow.h   |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 kommander/widget/CMakeLists.txt

(limited to 'kommander/widget')

diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt
new file mode 100644
index 00000000..38fb56f7
--- /dev/null
+++ b/kommander/widget/CMakeLists.txt
@@ -0,0 +1,46 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kommander/plugin
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kommanderwidget (shared)
+
+tde_add_library( kommanderwidget SHARED AUTOMOC
+
+  SOURCES
+        expression.cpp function.cpp
+        functionlib.cpp invokeclass.cpp
+        kmdrmainwindow.cpp kommanderfunctions.cpp
+        kommanderwidget.cpp kommanderwindow.cpp
+        myprocess.cpp parsenode.cpp
+        parser.cpp parserdata.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+     kommanderplugin-shared
+     kommanderfactory-static
+
+  DESTINATION ${LIB_INSTALL_DIR}
+  
+  VERSION 0.0.0
+)
+
+
+##### headers
+
+install(
+    FILES kommanderwidget.h kommander_export.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 5805c58d..845cc905 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kmdrmainwindow.h"
 
 #include <tqtimer.h>
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 91be985d..cc1b57d3 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,7 +17,7 @@
 /**
 	@author Andras Mantia <amantia@kdewebdev.org>
 */
-class KmdrMainWindow : public TDEMainWindow
+class KDE_EXPORT KmdrMainWindow : public TDEMainWindow
 {
 Q_OBJECT
   
-- 
cgit v1.2.1