From 664a1607314023d497531dca30618eb6e32efd65 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Thu, 14 Feb 2019 15:44:24 +0100 Subject: conversion to the cmake building system Signed-off-by: gregory guy (cherry picked from commit 7a10077e8260148faa37d5a91e76135e1341e4c1) --- .../plugins/catalogs/googlecatalog/CMakeLists.txt | 45 ++++++++++++++++++++++ .../catalogs/googlecatalog/actionsearch.cpp | 2 +- .../plugins/catalogs/googlecatalog/actionsearch.h | 2 +- .../catalogs/googlecatalog/googlecatalog.cpp | 4 +- .../plugins/catalogs/googlecatalog/googlecatalog.h | 2 +- 5 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 katapult/plugins/catalogs/googlecatalog/CMakeLists.txt (limited to 'katapult/plugins/catalogs/googlecatalog') 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 #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 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 #include "actionsearch.h" -#include "status.h" +#include K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog, KGenericFactory( "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 #include "query.h" -#include "katapultcatalog.h" +#include class TQWidget; -- cgit v1.2.3