summaryrefslogtreecommitdiffstats
path: root/quanta/src
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 /quanta/src
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 'quanta/src')
-rw-r--r--quanta/src/CMakeLists.txt27
-rw-r--r--quanta/src/quanta.cpp4
-rw-r--r--quanta/src/quanta_init.cpp5
-rw-r--r--quanta/src/viewmanager.cpp4
4 files changed, 30 insertions, 10 deletions
diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index ff7d5d4c..dfd385f1 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
${CMAKE_BINARY_DIR}/quanta/components/tableeditor
${CMAKE_BINARY_DIR}/quanta/components/csseditor
${CMAKE_BINARY_DIR}/quanta/components/framewizard
+ ${CMAKE_BINARY_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/quanta/src
${CMAKE_SOURCE_DIR}/quanta/project
@@ -31,6 +32,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/components/tableeditor
${CMAKE_SOURCE_DIR}/quanta/components/csseditor
${CMAKE_SOURCE_DIR}/quanta/components/framewizard
+ ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/treeviews
${CMAKE_SOURCE_DIR}/quanta/plugins
@@ -57,6 +59,7 @@ install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
set_property( SOURCE kqapp.cpp APPEND PROPERTY COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}" )
tde_add_executable( quanta AUTOMOC
+
SOURCES
quanta_init.cpp quantaview.cpp quantadoc.cpp
main.cpp document.cpp kqapp.cpp quanta.cpp
@@ -64,15 +67,19 @@ tde_add_executable( quanta AUTOMOC
dcopquantaif.skel dcopsettings.cpp dtds.cpp
dcopquanta.cpp viewmanager.cpp
LINK
- project-static plugins-static parser-static
- dtdparser-static treeviews-static dialogs-static
- debuggermanager-static tagdialogs-static
- settingsdialogs-static messages-static
- framewizard-static csseditor-static
- tableeditor-static preview-static
- utility-static quantamodule-static
- kafkalibrary-static tdemdi-shared tdehtml-shared
- tdenewstuff-shared tdeabc-shared tdetexteditor-shared
- ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
+ tdecore-shared tdeui-shared tdeio-shared
+ katepartinterfaces-shared tdenewstuff-shared
+ tdeabc-shared tdetexteditor-shared
+ tdemdi-shared tdehtml-shared tdespell-shared
+ kafkalibrary-static project-static
+ plugins-static parser-static
+ dtdparser-static treeviews-static
+ dialogs-static debuggermanager-static
+ tagdialogs-static settingsdialogs-static
+ messages-static framewizard-static
+ csseditor-static tableeditor-static
+ preview-static utility-static quantamodule-static
+ ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CVSSERVICE_LIBRARIES}
+
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index d72cce65..ada70492 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -15,6 +15,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <time.h>
// include files for QT
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index f01f22d7..62931561 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
// include files for QT
#include <tqdir.h>
#include <tqprinter.h>
@@ -1348,6 +1352,7 @@ TQString QuantaInit::retrievePID(const TQString& filename)
TQString strPID = TQString();
strPID = filename.mid(filename.findRev("P") + 1);
+
if (strPID.isEmpty())
strPID = filename.mid(filename.findRev("N") + 1);
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 831b81f0..92e502a2 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -12,6 +12,10 @@
*
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//qt includes
#include <tqdir.h>