From 949a4222cb7b9155358ea9b1dca2c08f477b7694 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 7 Feb 2013 18:27:34 +0100
Subject: [PATCH] search for KF5, use KF5 namespace in linking some stuff

---
 CMakeLists.txt              | 3 +++
 plasma/CMakeLists.txt       | 2 +-
 plasma/tests/CMakeLists.txt | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1427d232f..37022ca1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,8 +58,10 @@ configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCu
 
 set (QT_MIN_VERSION "5.0.0")
 
+find_package(KF5 REQUIRED)
 find_package(KDE4Internal REQUIRED)
 #find_package(KF5Transitional REQUIRED)
+
 include(KDE4Defaults)
 #include (MacroLibrary)
 
@@ -69,6 +71,7 @@ find_package(itemmodels REQUIRED)
 find_package(kwidgetsaddons REQUIRED)
 find_package(kwindowsystem REQUIRED)
 find_package(kcodecs REQUIRED)
+find_package(karchive REQUIRED)
 find_package(ki18n REQUIRED)
 find_package(kcoreaddons REQUIRED)
 find_package(solid REQUIRED)
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 7c822f8e7..f59b1206a 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -185,7 +185,7 @@ target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY}
                               ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} 
                              ${KDE4_KDEUI_LIBS} kdnssd threadweaver kauth KF5::kwindowsystem ${PLASMA_EXTRA_LIBS} kcoreaddons ki18n)
 #FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
-target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative karchive)
+target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative KF5::karchive)
 
 if(QCA2_FOUND)
    target_link_libraries(plasma ${QCA2_LIBRARIES})
diff --git a/plasma/tests/CMakeLists.txt b/plasma/tests/CMakeLists.txt
index 8d66e4674..800af4d27 100644
--- a/plasma/tests/CMakeLists.txt
+++ b/plasma/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ MACRO(PLASMA_UNIT_TESTS)
        FOREACH(_testname ${ARGN})
                kde4_add_unit_test(${_testname} TESTNAME plasma-${_testname} ${_testname}.cpp)
                target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
-                                     ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} plasma kcoreaddons karchive)
+                                     ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} plasma kcoreaddons KF5::karchive)
                if(QT_QTOPENGL_FOUND)
                    target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
                endif(QT_QTOPENGL_FOUND)