From 7f4379ff66661fca27ccf294252537adbf82710e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 29 Aug 2023 04:45:47 +0300 Subject: [PATCH] kimageviewer: adjust Signed-off-by: Ivailo Monev --- kimageviewer/CMakeLists.txt | 27 ++++++++++++++++----------- kimageviewer/kimagepart.cpp | 5 +---- kimageviewer/main.cpp | 13 ++++++------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/kimageviewer/CMakeLists.txt b/kimageviewer/CMakeLists.txt index 36293e3e..e7e11f75 100644 --- a/kimageviewer/CMakeLists.txt +++ b/kimageviewer/CMakeLists.txt @@ -1,8 +1,13 @@ project(KImageViewer) -find_package(KDE4 REQUIRED) -include(KDE4Defaults) -include_directories(${KDE4_INCLUDES}) +if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + include(FeatureSummary) + + find_package(KDELibs4 4.23.0 REQUIRED) + + include_directories(${KDE4_INCLUDES}) + add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) +endif() # application set(kimageviewer_SRCS @@ -13,10 +18,10 @@ set(kimageviewer_SRCS add_executable(kimageviewer ${kimageviewer_SRCS}) target_link_libraries(kimageviewer - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdecore + KDE4::kparts + KDE4::kdeui + KDE4::kio ) ## part @@ -28,10 +33,10 @@ set(kimageviewerpart_SRCS kde4_add_plugin(kimageviewerpart ${kimageviewerpart_SRCS}) target_link_libraries(kimageviewerpart - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} + KDE4::kdecore + KDE4::kparts + KDE4::kdeui + KDE4::kio ) ## install everything diff --git a/kimageviewer/kimagepart.cpp b/kimageviewer/kimagepart.cpp index dcfa4341..5f0d6bc1 100644 --- a/kimageviewer/kimagepart.cpp +++ b/kimageviewer/kimagepart.cpp @@ -43,10 +43,7 @@ K_EXPORT_PLUGIN(KImageViewerPartFactory(KAboutData( "1.0.0", ki18n("Simple image viewer for KDE."), KAboutData::License_GPL_V2, - ki18n("(c) 2014-2020 Ivailo Monev"), - KLocalizedString(), - "http://github.com/fluxer/kde-playground", - "xakepa10@gmail.com"). + ki18n("(c) 2014 Ivailo Monev")). setProgramIconName(QLatin1String("KImageViewer")). setCatalogName("kimageviewer"))) diff --git a/kimageviewer/main.cpp b/kimageviewer/main.cpp index a180d1f1..c185cc22 100644 --- a/kimageviewer/main.cpp +++ b/kimageviewer/main.cpp @@ -32,13 +32,12 @@ #include int main(int argc, char **argv) { - KAboutData aboutData("kimageviewer", 0, ki18n("KImageViewer"), - "1.0.0", ki18n("Simple image viewer for KDE."), - KAboutData::License_GPL_V2, - ki18n("(c) 2016 Ivailo Monev"), - KLocalizedString(), - "http://github.com/fluxer/kde-playground" - ); + KAboutData aboutData( + "kimageviewer", 0, ki18n("KImageViewer"), + "1.0.0", ki18n("Simple image viewer for KDE."), + KAboutData::License_GPL_V2, + ki18n("(c) 2016 Ivailo Monev") + ); aboutData.addAuthor(ki18n("Ivailo Monev"), ki18n("Maintainer"),