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>
---
 klinkstatus/src/ui/CMakeLists.txt                  | 32 ++++++++++++++++++++++
 klinkstatus/src/ui/sessionwidgetbase.ui            | 16 +++++------
 klinkstatus/src/ui/settings/CMakeLists.txt         | 32 ++++++++++++++++++++++
 klinkstatus/src/ui/settings/Makefile.am            |  4 +++
 .../ui/settings/configidentificationdialogui.ui    |  8 +++---
 klinkstatus/src/ui/settings/configsearchdialog.ui  |  9 ++----
 klinkstatus/src/ui/settings/dummy.cpp              |  0
 7 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 klinkstatus/src/ui/CMakeLists.txt
 create mode 100644 klinkstatus/src/ui/settings/CMakeLists.txt
 delete mode 100644 klinkstatus/src/ui/settings/dummy.cpp

(limited to 'klinkstatus/src/ui')

diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt
new file mode 100644
index 00000000..a2d49e43
--- /dev/null
+++ b/klinkstatus/src/ui/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_subdirectory( settings )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ui (static)
+
+tde_add_library( ui STATIC_PIC AUTOMOC
+
+  SOURCES
+        sessionwidgetbase.ui
+        sessionwidget.cpp tabwidgetsession.cpp
+        klshistorycombo.cpp resultview.cpp
+        treeview.cpp resultssearchbar.cpp
+        documentrootdialog.cpp
+  LINK
+     cfg-static
+)
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 53cdd510..19f3679c 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -591,12 +591,12 @@
     <slot specifier="pure virtual">slotClearComboUrl()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klshistorycombo.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>resultssearchbar.h</includehint>
-    <includehint>treeview.h</includehint>
-    <includehint>kprogress.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klshistorycombo.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">resultssearchbar.h</include>
+	<include location="global" impldecl="in implementation">treeview.h</include>
+	<include location="global" impldecl="in implementation">kprogress.h</include>
+	<include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt
new file mode 100644
index 00000000..d1fb1f3d
--- /dev/null
+++ b/klinkstatus/src/ui/settings/CMakeLists.txt
@@ -0,0 +1,32 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
+  ${CMAKE_BINARY_DIR}/klinkstatus/src
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### settings (static)
+
+file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+
+tde_add_library( settings STATIC_PIC AUTOMOC
+
+  SOURCES
+        configsearchdialog.ui
+        configresultsdialog.ui
+        configidentificationdialogui.ui
+        ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+        configidentificationdialog.cpp
+        
+  DEPENDENCIES
+        cfg-static
+)
diff --git a/klinkstatus/src/ui/settings/Makefile.am b/klinkstatus/src/ui/settings/Makefile.am
index 777e9e5c..07fcba6c 100644
--- a/klinkstatus/src/ui/settings/Makefile.am
+++ b/klinkstatus/src/ui/settings/Makefile.am
@@ -2,6 +2,10 @@ INCLUDES = -I$(top_builddir)/klinkstatus/src/cfg -I$(top_builddir)/klinkstatus/s
 METASOURCES = AUTO
 libsettings_la_LDFLAGS = $(all_libraries)
 noinst_LTLIBRARIES =  libsettings.la
+CLEANFILES = dummy.cpp
 libsettings_la_SOURCES = configsearchdialog.ui dummy.cpp configresultsdialog.ui \
 	configidentificationdialog.cpp configidentificationdialogui.ui
 noinst_HEADERS = configidentificationdialog.h
+
+dummy.cpp:
+	echo > dummy.cpp
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 87b73fbf..8b30ed58 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -127,8 +127,8 @@
     <tabstop>buttonDefault</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 72c420ca..097c08fc 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -344,10 +344,7 @@
     <tabstop>kcfg_RememberCheckSettings</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/klinkstatus/src/ui/settings/dummy.cpp b/klinkstatus/src/ui/settings/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
-- 
cgit v1.2.3