alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

port threadweaver usage to installed includes

Browse Source
This commit is contained in:
Marco Martin 2013-01-30 17:31:32 +01:00
parent 80980663c8
commit ff49303cbb
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -301,11 +301,9 @@ configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h
configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h ) configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
# Needed for the calls to kconfig_add_kcfg_files in some modules # Needed for the calls to kconfig_add_kcfg_files in some modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tier2/kconfig/cmake")
set(KCONFIG_KCFGC_EXECUTABLE kconfig_compiler) set(KCONFIG_KCFGC_EXECUTABLE kconfig_compiler)
include(KConfigMacros) include(KConfigMacros)
set(kde4support_LIBRARY kde4support)
################# list the subdirectories ################# ################# list the subdirectories #################

37
plasma/CMakeLists.txt
View File

@ -24,31 +24,34 @@ endif(NOT X11_FOUND)
#find_package(Gpgme) #find_package(Gpgme)
#macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines") #macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${KDE4_KDECORE_INCLUDES} ${KDE4_INCLUDE_DIR}
${KDE4_KDEUI_INCLUDES} ${KDE4_INCLUDE_DIR}/KDE
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative # ${KDE4_KDEUI_INCLUDES}
${CMAKE_BINARY_DIR}/experimental/libkdeclarative # ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
${karchive_SOURCE_DIR}/src # ${CMAKE_BINARY_DIR}/experimental/libkdeclarative
${karchive_BINARY_DIR}/src # ${karchive_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/tier2/kauth/src/ # ${karchive_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/tier2/kauth/src/ # ${CMAKE_SOURCE_DIR}/tier2/kauth/src/
${CMAKE_SOURCE_DIR}/tier1/threadweaver/src # ${CMAKE_BINARY_DIR}/tier2/kauth/src/
${CMAKE_BINARY_DIR}/tier1/threadweaver/src # ${CMAKE_SOURCE_DIR}/tier1/threadweaver/src
${CMAKE_BINARY_DIR}/tier1/threadweaver/src/Weaver # ${CMAKE_BINARY_DIR}/tier1/threadweaver/src
${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/ # ${CMAKE_BINARY_DIR}/tier1/threadweaver/src/Weaver
${CMAKE_BINARY_DIR}/tier1/kwindowsystem/ # ${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/
${CMAKE_SOURCE_DIR}/tier1/solid/src # ${CMAKE_BINARY_DIR}/tier1/kwindowsystem/
${CMAKE_BINARY_DIR}/tier1/solid/src # ${CMAKE_SOURCE_DIR}/tier1/solid/src
# ${CMAKE_BINARY_DIR}/tier1/solid/src
# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/caching
${CMAKE_SOURCE_DIR}/plasma/remote ${CMAKE_SOURCE_DIR}/plasma/remote
${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie
${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch
${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/includes ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/includes
${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/caching
${ki18n_SOURCE_DIR}/src ${ki18n_SOURCE_DIR}/src
${ki18n_BINARY_DIR}/src ${ki18n_BINARY_DIR}/src
${KDE4_INCLUDE_DIR}/threadweaver
#FIXME: this will go into Qt upstream
${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
) )
if(NOT PLASMA_NO_KIO) if(NOT PLASMA_NO_KIO)

1
plasma/applet.cpp
View File

@ -73,7 +73,6 @@
#include "configloader.h" #include "configloader.h"
#include "containment.h" #include "containment.h"
#include "corona.h" #include "corona.h"
#include "dialog.h"
#include "package.h" #include "package.h"
#include "plasma.h" #include "plasma.h"
#include "scripting/appletscript.h" #include "scripting/appletscript.h"

2
plasma/private/runnerjobs.cpp
View File

@ -24,7 +24,7 @@
#include <kdebug.h> #include <kdebug.h>
//#include <Weaver/DebuggingAids.h> //#include <Weaver/DebuggingAids.h>
#include <Weaver/ThreadWeaver.h> #include <threadweaver/ThreadWeaver.h>
#include "runnermanager.h" #include "runnermanager.h"
#include "plasma/querymatch.h" #include "plasma/querymatch.h"

4
plasma/private/runnerjobs_p.h
View File

@ -24,8 +24,8 @@
#include <QMutex> #include <QMutex>
#include <QSet> #include <QSet>
#include <Weaver/Job.h> #include <threadweaver/Job.h>
#include <Weaver/QueuePolicy.h> #include <threadweaver/QueuePolicy.h>
#include "abstractrunner.h" #include "abstractrunner.h"

8
plasma/runnermanager.cpp
View File

@ -37,10 +37,10 @@
#include <solid/deviceinterface.h> #include <solid/deviceinterface.h>
#endif #endif
#include <Weaver/DebuggingAids.h> #include <threadweaver/DebuggingAids.h>
#include <Weaver/State.h> #include <threadweaver/State.h>
#include <Weaver/Thread.h> #include <threadweaver/Thread.h>
#include <Weaver/ThreadWeaver.h> #include <threadweaver/ThreadWeaver.h>
#include "private/runnerjobs_p.h" #include "private/runnerjobs_p.h"
#include "pluginloader.h" #include "pluginloader.h"