From 454bf83be39f4892da7a61f8e24f535c2b0a515c Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Thu, 11 Jul 2013 22:57:04 +0200
Subject: [PATCH] -adapt to current changes in kdelibs regarding kde4support:
 use ${KDE4Support_LIBRARIES} when using it

Search for KDE4Support, but after searching KDELibs4, this is hackish, but currentlx necessary due to
cyclic dependencies we still have

Alex
---
 CMakeLists.txt                                                | 4 +++-
 src/declarativeimports/core/tests/CMakeLists.txt              | 2 +-
 src/declarativeimports/dirmodel/CMakeLists.txt                | 2 +-
 src/declarativeimports/qtextracomponents/tests/CMakeLists.txt | 2 +-
 src/plasma/CMakeLists.txt                                     | 2 +-
 src/scriptengines/qml/CMakeLists.txt                          | 2 +-
 src/shell/CMakeLists.txt                                      | 3 +--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 402942400..680011994 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
 #find_package(KF5Transitional REQUIRED)
 
 # those are not "done" yet:
-find_package(kde4support REQUIRED NO_MODULE)
 find_package(ktextwidgets REQUIRED NO_MODULE)
 find_package(ki18n REQUIRED NO_MODULE)
 find_package(kio REQUIRED NO_MODULE)
@@ -64,6 +63,9 @@ find_package(kdeclarative REQUIRED NO_MODULE)
 # FIXME: remove when kdeui is fully split up
 find_package(KDELibs4 REQUIRED NO_MODULE)
 
+# must be after KDELibs4, since it links against imported targets coming from KDELibs4Config.cmake:
+find_package(KDE4Support REQUIRED NO_MODULE)
+
 #optional features
 find_package(X11 MODULE)
 if(X11_FOUND)
diff --git a/src/declarativeimports/core/tests/CMakeLists.txt b/src/declarativeimports/core/tests/CMakeLists.txt
index d6a88eb56..db76e279e 100644
--- a/src/declarativeimports/core/tests/CMakeLists.txt
+++ b/src/declarativeimports/core/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ qt4_automoc(sortfiltermodeltest.cpp)
 
 target_link_libraries(sortfiltermodeltest
     plasma
-    KDE4__kde4support
+    ${KDE4Support_LIBRARIES}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     )
diff --git a/src/declarativeimports/dirmodel/CMakeLists.txt b/src/declarativeimports/dirmodel/CMakeLists.txt
index 99ee17f21..5dab6adf2 100644
--- a/src/declarativeimports/dirmodel/CMakeLists.txt
+++ b/src/declarativeimports/dirmodel/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(dirmodelplugin
         ${QT_QTCORE_LIBRARY}
         ${Qt5Qml_LIBRARIES}
         ${KDE4_KIO_LIBS}
-        KDE4__kde4support
+        ${KDE4Support_LIBRARIES}
         )
 
 install(TARGETS dirmodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/dirmodel)
diff --git a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
index 7e6071779..54f9a17f6 100644
--- a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(fullmodelaccesstest
     ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     ${KDE4_KDECORE_LIBS}
-    KDE4__kde4support
+    ${KDE4Support_LIBRARIES}
     )
 
 add_test(plasma-fullmodelaccesstest fullmodelaccesstest)
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index e7ed54d45..69e9b556c 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -149,7 +149,7 @@ target_link_libraries(plasma
     ${KWindowSystem_LIBRARIES}
     ${PLASMA_EXTRA_LIBS}
     ki18n
-    ${kde4support_LIBRARY}
+    ${KDE4Support_LIBRARIES}
 )
 #FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
 target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES})
diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt
index af2609f02..728771b34 100644
--- a/src/scriptengines/qml/CMakeLists.txt
+++ b/src/scriptengines/qml/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common)
 kde4_add_plugin(plasma_appletscript_declarative ${declarative_appletscript_SRCS})
 target_link_libraries(plasma_appletscript_declarative
     ${KDE4_KIO_LIBS}
-    ${KDE4_KDE4SUPPORT_LIBS}
+    ${KDE4Support_LIBRARIES}
     ${QT_QTSCRIPT_LIBRARY}
     ${Qt5Quick_LIBRARIES}
     ${Qt5Qml_LIBRARIES}
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 4c24ec3b7..105423850 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -82,11 +82,10 @@ target_link_libraries(plasma-shell
  plasma
  ${Qt5Script_LIBRARIES}
  ${KDE4_KDEUI_LIBS}
- KDE4__kde4support
+ ${KDE4Support_LIBRARIES}
  ${Solid_LIBRARIES}
  kdeclarative
 )
-message("+++ kde4support : ${kde4support_LIBRARY}")
 
 
 install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS})