summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-02-14 15:44:24 +0100
committergregory guy <g-gregory@gmx.fr>2019-02-14 15:44:24 +0100
commit7a10077e8260148faa37d5a91e76135e1341e4c1 (patch)
tree6bfabbcd9017c63c91a5ee7e2434e917906b3f55
parentd165ef2d365fc582b966fbcb0bbac5223c7b02cc (diff)
downloadkatapult-7a10077e8260148faa37d5a91e76135e1341e4c1.zip
katapult-7a10077e8260148faa37d5a91e76135e1341e4c1.tar.gz
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr>
-rw-r--r--CMakeLists.txt78
-rw-r--r--ConfigureChecks.cmake26
-rw-r--r--config.h.cmake8
-rw-r--r--doc/CMakeLists.txt1
-rw-r--r--doc/katapult/CMakeLists.txt1
-rw-r--r--doc/man/CMakeLists.txt5
-rw-r--r--doc/man/katapult.169
-rw-r--r--katapult/CMakeLists.txt3
-rw-r--r--katapult/common/CMakeLists.txt43
-rw-r--r--katapult/katapult/CMakeLists.txt49
-rw-r--r--katapult/plugins/CMakeLists.txt2
-rw-r--r--katapult/plugins/catalogs/CMakeLists.txt8
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/actionplaysong.h2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/song.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt46
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.h2
-rw-r--r--katapult/plugins/catalogs/execcatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.cpp2
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.h2
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/CMakeLists.txt40
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.h2
-rw-r--r--katapult/plugins/display/CMakeLists.txt3
-rw-r--r--katapult/plugins/display/glassdisplay/CMakeLists.txt36
-rw-r--r--katapult/plugins/display/o2display/CMakeLists.txt36
-rw-r--r--katapult/plugins/display/puredisplay/CMakeLists.txt36
-rw-r--r--po/CMakeLists.txt7
50 files changed, 785 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..520d5b2
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,78 @@
+############################################
+# #
+# Improvements and feedbacks are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( katapult )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig )
+include( CheckFunctionExists )
+include( CheckSymbolExists )
+include( CheckIncludeFile )
+include( CheckLibraryExists )
+include( CheckCSourceCompiles )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( ${PROJECT_NAME} )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..889db5c
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,26 @@
+###########################################
+# #
+# Improvements and feedback are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+###########################################
+
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+ tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..61ede3a
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..6d0aa9f
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )
diff --git a/doc/katapult/CMakeLists.txt b/doc/katapult/CMakeLists.txt
new file mode 100644
index 0000000..ba3ef3e
--- /dev/null
+++ b/doc/katapult/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 0000000..8512250
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+ FILES ${PROJECT_NAME}.1
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/katapult.1 b/doc/man/katapult.1
new file mode 100644
index 0000000..870f4e0
--- /dev/null
+++ b/doc/man/katapult.1
@@ -0,0 +1,69 @@
+'\" -*- coding: us-ascii -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH katapult 1 2005-05-10 "" ""
+.SH NAME
+katapult \- A TDE laucher
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBkatapult\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[
+\fB\fIQt-options\fB\fR
+] [
+\fB\fITDE-options\fB\fR
+]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+Katapult is a TDE laucher.
+.PP
+It uses text-based queries to launch a program, a bookmark or a directory.
+.SH OPTIONS
+All TDE and Qt
+programs accept a some common command-line options. Katapult has no
+application-specific options.
+.PP
+.TP
+\*(T<\fB\-\-help\fR\*(T>
+Show help about options
+.TP
+\*(T<\fB\-\-help\-qt\fR\*(T>
+Show Qt specific options
+.TP
+\*(T<\fB\-\-help\-tde\fR\*(T>
+Show TDE specific options
+.TP
+\*(T<\fB\-\-help\-all\fR\*(T>
+Show all options
+.TP
+\*(T<\fB\-\-author\fR\*(T>
+Show author information
+.TP
+\*(T<\fB\-v\fR\*(T>, \*(T<\fB\-\-version\fR\*(T>
+Show version information
+.TP
+\*(T<\fB\-\-license\fR\*(T>
+Show license information
+.TP
+\*(T<\fB\-\-\fR\*(T>
+Indicates end of options
+.SH COPYRIGHT
+This manual page was written by Jean-Remy Falleri
+<\*(T<jr.falleri@laposte.net\*(T>> for the
+Ubuntu system (but may be used by others).
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License,
+Version 2 or any later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in
+\*(T<\fI/usr/share/common\-licenses/GPL\fR\*(T>.
diff --git a/katapult/CMakeLists.txt b/katapult/CMakeLists.txt
new file mode 100644
index 0000000..519be70
--- /dev/null
+++ b/katapult/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory( common )
+add_subdirectory( plugins )
+add_subdirectory( ${PROJECT_NAME} )
diff --git a/katapult/common/CMakeLists.txt b/katapult/common/CMakeLists.txt
new file mode 100644
index 0000000..b57fc60
--- /dev/null
+++ b/katapult/common/CMakeLists.txt
@@ -0,0 +1,43 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult (shared)
+
+tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC
+
+ SOURCES
+ imagedisplaysettings.ui
+ katapultitem.cpp
+ katapultaction.cpp
+ actionregistry.cpp
+ katapultcatalog.cpp
+ cachedcatalog.cpp
+ match.cpp
+ katapultdisplay.cpp
+ imagedisplay.cpp
+ VERSION 2.0.0
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapultcatalog.desktop katapultdisplay.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/katapult/katapult/CMakeLists.txt b/katapult/katapult/CMakeLists.txt
new file mode 100644
index 0000000..7a98783
--- /dev/null
+++ b/katapult/katapult/CMakeLists.txt
@@ -0,0 +1,49 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+ SOURCES
+ confgeneral.ui
+ confcatalogs.ui
+ confdisplay.ui
+ main.cpp
+ katapult.cpp
+ katapultsettings.cpp
+ katapultconfigdlg.cpp
+ katapultiface.skel
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other data
+
+install(
+ FILES ${PROJECT_NAME}.desktop
+ DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/katapult/plugins/CMakeLists.txt b/katapult/plugins/CMakeLists.txt
new file mode 100644
index 0000000..e6890dd
--- /dev/null
+++ b/katapult/plugins/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( catalogs )
+add_subdirectory( display )
diff --git a/katapult/plugins/catalogs/CMakeLists.txt b/katapult/plugins/catalogs/CMakeLists.txt
new file mode 100644
index 0000000..0081c28
--- /dev/null
+++ b/katapult/plugins/catalogs/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory( programcatalog )
+add_subdirectory( bookmarkcatalog )
+add_subdirectory( documentcatalog )
+add_subdirectory( calculatorcatalog )
+add_subdirectory( amarokcatalog )
+add_subdirectory( spellcatalog )
+add_subdirectory( googlecatalog )
+add_subdirectory( execcatalog )
diff --git a/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
new file mode 100644
index 0000000..88333aa
--- /dev/null
+++ b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_amarokcatalog (kpart)
+
+tde_add_kpart( katapult_amarokcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ amarokcatalog.cpp
+ coverimage.cpp
+ song.cpp
+ actionplaysong.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_amarokcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
index 255d1b1..e7efffd 100644
--- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
+++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
@@ -21,7 +21,7 @@
#ifndef ACTIONPLAYSONG_H
#define ACTIONPLAYSONG_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class TQPixmap;
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index ed4d4dd..071a265 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
@@ -340,3 +340,5 @@ void AmarokCatalog::writeSettings(TDEConfigBase *config)
{
config->writeEntry("MinQueryLen", _minQueryLen);
}
+
+#include "amarokcatalog.moc"
diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp
index cd461ab..f53fdbb 100644
--- a/katapult/plugins/catalogs/amarokcatalog/song.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp
@@ -24,7 +24,7 @@
#include <tqpixmap.h>
#include <tqimage.h>
#include <tqstring.h>
-#include <amarokcatalog.h>
+#include "amarokcatalog.h"
#include "song.h"
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
new file mode 100644
index 0000000..125473d
--- /dev/null
+++ b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_bookmarkcatalog (kpart) ##########
+
+tde_add_kpart( katapult_bookmarkcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ bookmarkcatalog.cpp
+ bookmark.cpp
+ actionopenbookmark.cpp
+ mozillabookmark.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_bookmarkcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
index 7381e86..05739f4 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
-#include "cachedcatalog.h"
+#include <cachedcatalog.h>
class TQWidget;
class TQString;
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
index 1b4a735..23876d4 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
+++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
@@ -22,7 +22,7 @@
#include <tqpixmap.h>
-#include "katapultitem.h"
+#include <katapultitem.h>
/**
@author Joe Ferris
diff --git a/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt b/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
new file mode 100644
index 0000000..d0111ca
--- /dev/null
+++ b/katapult/plugins/catalogs/calculatorcatalog/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}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_calculatorcatalog (kpart)
+
+tde_add_kpart( katapult_calculatorcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ calculatorcatalog.cpp
+ expression.cpp
+ actionevalexpr.cpp
+ parser.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( xcalc checkmark no )
+
+
+##### other data
+
+install(
+ FILES katapult_calculatorcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
index f04e65b..3e1ac3d 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
+++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
@@ -23,7 +23,7 @@
#ifndef ACTIONEVALEXPR_H
#define ACTIONEVALEXPR_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Expression;
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
index 39e7b57..6e951a2 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
+++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
@@ -31,7 +31,7 @@
#include <tqvaluevector.h>
#include "expression.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
new file mode 100644
index 0000000..7687e03
--- /dev/null
+++ b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_documentcatalog (kpart)
+
+tde_add_kpart( katapult_documentcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ documentcatalog.cpp
+ directory.cpp
+ document.cpp
+ actionopendocument.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_documentcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index a0a2833..b8a45aa 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
@@ -33,8 +33,8 @@
#include "documentcatalog.h"
#include "document.h"
#include "directory.h"
-#include "status.h"
-#include "match.h"
+#include <status.h>
+#include <match.h>
#include "actionopendocument.h"
K_EXPORT_COMPONENT_FACTORY( katapult_documentcatalog,
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
index d406370..20133a6 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
@@ -27,7 +27,7 @@
#include <tqptrlist.h>
#include <tqdir.h>
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
class Document;
diff --git a/katapult/plugins/catalogs/execcatalog/CMakeLists.txt b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
new file mode 100644
index 0000000..b35b345
--- /dev/null
+++ b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_execcatalog (kpart)
+
+tde_add_kpart( katapult_execcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ execcatalog.cpp
+ command.cpp
+ actionrun.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_execcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
index 0254d6f..ef99b85 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp
+++ b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
@@ -32,7 +32,7 @@
#include "execcatalog.h"
#include "command.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionrun.h"
ActionRun::ActionRun()
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.h b/katapult/plugins/catalogs/execcatalog/actionrun.h
index 2e13996..c1e4b8e 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.h
+++ b/katapult/plugins/catalogs/execcatalog/actionrun.h
@@ -26,7 +26,7 @@
#ifndef ACTIONRUN_H
#define ACTIONRUN_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Command;
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index b08527d..05cab17 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "execcatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionrun.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_execcatalog,
KGenericFactory<ExecCatalog>( "katapult_execcatalog" ) )
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.h b/katapult/plugins/catalogs/execcatalog/execcatalog.h
index 5c5c5f3..4049a83 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.h
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.h
@@ -34,7 +34,7 @@
#include <tqstring.h>
#include "command.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
new file mode 100644
index 0000000..32c5bb5
--- /dev/null
+++ b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_googlecatalog (kpart)
+
+tde_add_kpart( katapult_googlecatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ googlecatalog.cpp
+ query.cpp
+ actionsearch.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_googlecatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
index 31c4a64..b69bc3f 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
@@ -33,7 +33,7 @@
#include "googlecatalog.h"
#include "query.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionsearch.h"
ActionSearch::ActionSearch()
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.h b/katapult/plugins/catalogs/googlecatalog/actionsearch.h
index f3a4382..0f25b6b 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.h
+++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.h
@@ -26,7 +26,7 @@
#ifndef ACTIONSEARCH_H
#define ACTIONSEARCH_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class SearchQuery;
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index d696a42..8346b1a 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "googlecatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionsearch.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog,
KGenericFactory<GoogleCatalog>( "katapult_googlecatalog" ) )
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
index 29f3bd6..bd5562c 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
@@ -34,7 +34,7 @@
#include <tqstring.h>
#include "query.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/programcatalog/CMakeLists.txt b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
new file mode 100644
index 0000000..3addcd3
--- /dev/null
+++ b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
@@ -0,0 +1,40 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_programcatalog (kpart)
+
+tde_add_kpart( katapult_programcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ programcatalog.cpp
+ program.cpp
+ actionrunprogram.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_programcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
index 98b7a9b..b5c080d 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
+++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
@@ -25,7 +25,7 @@
#include <tdelocale.h>
#include "program.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionrunprogram.h"
ActionRunProgram::ActionRunProgram()
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
index f182afa..217821d 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
+++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
@@ -20,7 +20,7 @@
#ifndef ACTIONRUNPROGRAM_H
#define ACTIONRUNPROGRAM_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
index e9096e6..bd7f581 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
@@ -30,7 +30,7 @@
#include "settings.h"
#include "programcatalog.h"
#include "program.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionrunprogram.h"
K_EXPORT_COMPONENT_FACTORY( katapult_programcatalog,
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.h b/katapult/plugins/catalogs/programcatalog/programcatalog.h
index af20c70..842cba6 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.h
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include "cachedcatalog.h"
+#include <cachedcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
new file mode 100644
index 0000000..692fea9
--- /dev/null
+++ b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_spellcatalog (kpart)
+
+tde_add_kpart( katapult_spellcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ spellcatalog.cpp
+ spelling.cpp
+ actioncopyspelling.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_spellcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
index 5b7c815..5dc5b0c 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
@@ -30,7 +30,7 @@
#include "spellcatalog.h"
#include "spelling.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actioncopyspelling.h"
ActionCopySpelling::ActionCopySpelling()
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
index 669ba49..ad35f06 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
@@ -23,7 +23,7 @@
#ifndef ACTIONCOPYSPELLING_H
#define ACTIONCOPYSPELLING_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Spelling;
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index 76dde5d..941781b 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "spellcatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actioncopyspelling.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_spellcatalog,
KGenericFactory<SpellCatalog>( "katapult_spellcatalog" ) )
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
index 8dd9215..b4ed036 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
@@ -31,7 +31,7 @@
#include <tqstring.h>
#include "spelling.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/display/CMakeLists.txt b/katapult/plugins/display/CMakeLists.txt
new file mode 100644
index 0000000..4820a7f
--- /dev/null
+++ b/katapult/plugins/display/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory( glassdisplay )
+add_subdirectory( puredisplay )
+add_subdirectory( o2display )
diff --git a/katapult/plugins/display/glassdisplay/CMakeLists.txt b/katapult/plugins/display/glassdisplay/CMakeLists.txt
new file mode 100644
index 0000000..d5fe0e0
--- /dev/null
+++ b/katapult/plugins/display/glassdisplay/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_glassdisplay (kpart)
+
+tde_add_kpart( katapult_glassdisplay AUTOMOC
+
+ SOURCES
+ glassdisplay.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_glassdisplay.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/display/o2display/CMakeLists.txt b/katapult/plugins/display/o2display/CMakeLists.txt
new file mode 100644
index 0000000..4729d48
--- /dev/null
+++ b/katapult/plugins/display/o2display/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_o2display (kpart)
+
+tde_add_kpart( katapult_o2display AUTOMOC
+
+ SOURCES
+ o2display.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_o2display.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/display/puredisplay/CMakeLists.txt b/katapult/plugins/display/puredisplay/CMakeLists.txt
new file mode 100644
index 0000000..114fa46
--- /dev/null
+++ b/katapult/plugins/display/puredisplay/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_puredisplay (kpart)
+
+tde_add_kpart( katapult_puredisplay AUTOMOC
+
+ SOURCES
+ puredisplay.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_puredisplay.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..e3b5278
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_NAME}.po )
+
+foreach( _po ${po_files} )
+ string( REPLACE "/" ";" _path "${_po}" )
+ list( GET _path 0 _lang )
+ tde_create_translation( FILES ${_po} LANG ${_lang} )
+endforeach( )