From a4b9dd94006953a0b6bf594124be599616a1a1cf Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Fri, 20 Jan 2023 23:58:58 +0100 Subject: [PATCH] Rename CMake targets/config/libraries for KF6 --- CMakeLists.txt | 4 ++-- autotests/CMakeLists.txt | 2 +- src/imageformats/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdf7597..9ef0c2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,8 @@ include(FindPkgConfig) set(REQUIRED_QT_VERSION 6.4.0) find_package(Qt${QT_MAJOR_VERSION}Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(KF5Archive) -set_package_properties(KF5Archive PROPERTIES +find_package(KF6Archive) +set_package_properties(KF6Archive PROPERTIES TYPE OPTIONAL PURPOSE "Required for the QImage plugin for Krita and OpenRaster images" ) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index ed44661..c807e55 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -75,7 +75,7 @@ kimageformats_read_tests( tga ) -if (KF5Archive_FOUND) +if (KF6Archive_FOUND) kimageformats_read_tests( kra ora diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt index a300e60..a50f3ad 100644 --- a/src/imageformats/CMakeLists.txt +++ b/src/imageformats/CMakeLists.txt @@ -175,16 +175,16 @@ endif() ################################## -if (KF5Archive_FOUND) +if (KF6Archive_FOUND) kimageformats_add_plugin(kimg_kra SOURCES kra.cpp) - target_link_libraries(kimg_kra KF5::Archive) + target_link_libraries(kimg_kra KF6::Archive) if (QT_MAJOR_VERSION STREQUAL "5") install(FILES kra.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/) endif() kimageformats_add_plugin(kimg_ora SOURCES ora.cpp) - target_link_libraries(kimg_ora KF5::Archive) + target_link_libraries(kimg_ora KF6::Archive) if (QT_MAJOR_VERSION STREQUAL "5") install(FILES ora.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}/qimageioplugins/) endif()