From eea71ca9ecdfbd4682054a86cc9bbf954af94693 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>
(cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130)
---
 quanta/components/cvsservice/CMakeLists.txt     | 21 +++++++++++++++++++++
 quanta/components/cvsservice/cvscommitdlgs.ui   |  8 +++++---
 quanta/components/cvsservice/cvsupdatetodlgs.ui |  5 +++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 quanta/components/cvsservice/CMakeLists.txt

(limited to 'quanta/components/cvsservice')

diff --git a/quanta/components/cvsservice/CMakeLists.txt b/quanta/components/cvsservice/CMakeLists.txt
new file mode 100644
index 00000000..7f2010ae
--- /dev/null
+++ b/quanta/components/cvsservice/CMakeLists.txt
@@ -0,0 +1,21 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${CMAKE_SOURCE_DIR}/quanta/src
+  ${CMAKE_SOURCE_DIR}/quanta/project
+  ${CMAKE_SOURCE_DIR}/quanta/parsers
+  ${CMAKE_SOURCE_DIR}/quanta/utility
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+##### cvsservice (static)
+
+tde_add_library( cvsservice STATIC_PIC AUTOMOC
+
+  SOURCES
+        cvsservicedcopif.skel
+        cvscommitdlgs.ui
+        cvsupdatetodlgs.ui
+        cvsservice.cpp
+)
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index f63b910e..9ff2c938 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -144,7 +144,9 @@
     <tabstop>cancelButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index d4d2dc7b..bdec051a 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -195,4 +195,9 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
+<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>
-- 
cgit v1.2.3