45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
|
Fix finding taskmanager.h and kworkspace.h
|
||
|
|
diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
|
||
|
|
index 3a72241..69b1205 100644
|
||
|
|
--- a/plasma/applet/CMakeLists.txt
|
||
|
|
+++ b/plasma/applet/CMakeLists.txt
|
||
|
|
@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
|
||
|
|
else(NOT QT_VERSION_OK)
|
||
|
|
|
||
|
|
set(TASKMANAGER_FOUND FALSE)
|
||
|
|
- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
|
||
|
|
+ FIND_PATH(TASKMANAGER_INCLUDE_DIR
|
||
|
|
+ NAMES taskmanager/taskmanager.h
|
||
|
|
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
|
||
|
|
FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||
|
|
|
||
|
|
if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
|
||
|
|
diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
|
||
|
|
index 59e5470..5b932ff 100644
|
||
|
|
--- a/plugins/shutdown/CMakeLists.txt
|
||
|
|
+++ b/plugins/shutdown/CMakeLists.txt
|
||
|
|
@@ -1,6 +1,8 @@
|
||
|
|
set(KWORKSPACE_FOUND FALSE)
|
||
|
|
-FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
|
||
|
|
-FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||
|
|
+FIND_PATH(KWORKSPACE_INCLUDE_DIR
|
||
|
|
+ NAMES kworkspace/kworkspace.h
|
||
|
|
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
|
||
|
|
+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||
|
|
|
||
|
|
if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
|
||
|
|
set(KWORKSPACE_FOUND TRUE)
|
||
|
|
diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
|
||
|
|
index e233353..1efc20b 100644
|
||
|
|
--- a/plugins/shutdown/shutdownplugin.cpp
|
||
|
|
+++ b/plugins/shutdown/shutdownplugin.cpp
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
***************************************************************************/
|
||
|
|
#include <kjob.h>
|
||
|
|
#include <kgenericfactory.h>
|
||
|
|
-#include <kworkspace.h>
|
||
|
|
+#include <kworkspace/kworkspace.h>
|
||
|
|
#include <ktoggleaction.h>
|
||
|
|
#include <kactioncollection.h>
|
||
|
|
#include <kmessagebox.h>
|