summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-06-28 15:14:51 +0200
committergregory guy <gregory-tde@laposte.net>2021-03-11 15:04:14 +0100
commit4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (patch)
treee532b01e8168b2f849f8aaa3266a58b088705726 /lib
parent10d21d001e92e653cec6b6d1c05983abd00a1195 (diff)
downloadtdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.tar.gz
tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.zip
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. 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>
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt2
-rw-r--r--lib/compatibility/CMakeLists.txt2
-rw-r--r--lib/compatibility/tdemdi/CMakeLists.txt21
-rw-r--r--lib/compatibility/tdemdi/qextmdi/CMakeLists.txt27
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp3
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp2
6 files changed, 57 insertions, 0 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aaa33883..a76ed738 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -21,3 +21,5 @@ include_directories(
tde_add_library( quantamodule STATIC_PIC AUTOMOC
SOURCES qextfileinfo.cpp ksavealldialog.cpp
)
+
+add_subdirectory( compatibility )
diff --git a/lib/compatibility/CMakeLists.txt b/lib/compatibility/CMakeLists.txt
new file mode 100644
index 00000000..e879bf03
--- /dev/null
+++ b/lib/compatibility/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( tdemdi )
diff --git a/lib/compatibility/tdemdi/CMakeLists.txt b/lib/compatibility/tdemdi/CMakeLists.txt
new file mode 100644
index 00000000..c3973143
--- /dev/null
+++ b/lib/compatibility/tdemdi/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_subdirectory( qextmdi )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantatdemdi STATIC_PIC AUTOMOC
+
+ SOURCES
+ dummy.cpp
+ LINK
+ tdeparts-shared
+ tdeio-shared
+ quantaqextmdi-static
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
new file mode 100644
index 00000000..12bb58e5
--- /dev/null
+++ b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
@@ -0,0 +1,27 @@
+#add_subdirectory( res )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi/res
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+##### quantatdemdi (static)
+
+tde_add_library( quantaqextmdi STATIC_PIC AUTOMOC
+
+ SOURCES
+ tdemdichildarea.cpp tdemdichildfrm.cpp
+ tdemdichildfrmcaption.cpp tdemdichildview.cpp
+ tdemdimainfrm.cpp tdemditaskbar.cpp
+ tdemultitabbar.cpp tdemditoolviewaccessor.cpp
+ tdemdidocumentviewtabwidget.cpp tdemdifocuslist.cpp
+ tdemdiguiclient.cpp ktabwidget.cpp
+ ktabbar.cpp kdockwidget.cpp
+ kdockwidget_private.cpp tdemdidockcontainer.cpp
+ LINK
+ tdeparts-shared
+)
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 5721b249..adba273f 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -42,7 +42,10 @@
#include <kdebug.h>
#include <tdeglobalsettings.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#ifdef TQ_WS_X11
#include <X11/X.h>
#include <X11/Xlib.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 5d07126d..74c82f53 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -33,7 +33,9 @@
* ATTENTION: please do you part to try to make this file legible. It's
* extremely hard to read already. Especially follow the indenting rules.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <assert.h>