generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2025-02-23 18:32:50 +00:00 · 2015-10-31 13:44:54 +02:00 · 2015-10-31 13:44:54 +02:00 · 95f8e1b5ac
commit 95f8e1b5ac
parent ddbe8d46d2
44 changed files with 81 additions and 81 deletions
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@ -25,9 +25,9 @@ if (PAM_FOUND)
        install(CODE "
            set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
            if (NOT DESTDIR_VALUE)
-                exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
+                exec_program(\"${CMAKE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
                if (NOT ret)
-                    exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
+                    exec_program(\"${CMAKE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
                endif (NOT ret)
            endif (NOT DESTDIR_VALUE)
                    ")
--- a/kcontrol/kfontinst/apps/CMakeLists.txt
+++ b/kcontrol/kfontinst/apps/CMakeLists.txt
@ -1,6 +1,6 @@
 include_directories(
-	${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/kcmfontinst/
-	${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
+	${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/kcmfontinst/
+	${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
 	${CMAKE_CURRENT_BINARY_DIR}
 	)

--- a/kcontrol/kfontinst/dbus/CMakeLists.txt
+++ b/kcontrol/kfontinst/dbus/CMakeLists.txt
@ -1,6 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR} 
                    ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/fonts)
+                    ${CMAKE_SOURCE_DIR}/kcontrol/fonts)
 add_definitions(${QT_DEFINITIONS})

 set(fontinst_bin_SRCS FcConfig.cpp FontInst.cpp Folder.cpp Main.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
--- a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
@ -1,5 +1,5 @@
 include_directories( 
-	${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
+	${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
 	 )

 set(kcm_fontinst_PART_SRCS ${libkfontinstview_SRCS} ${libkfontinstjobrunner_SRCS} ${libkfontinstdbusiface_SRCS}
--- a/kcontrol/kfontinst/kio/CMakeLists.txt
+++ b/kcontrol/kfontinst/kio/CMakeLists.txt
@ -1,5 +1,5 @@
-# include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/fonts
-#                     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/kcmfontinst
+# include_directories(${CMAKE_SOURCE_DIR}/kcontrol/fonts
+#                     ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/kcmfontinst
 #                     ${CMAKE_CURRENT_BINARY_DIR})

 set(kio_fonts_PART_SRCS FontInstInterface.cpp KioFonts.cpp ${libkfontinstdbusiface_SRCS})
--- a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
+++ b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/lib/
+include_directories( ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib/
                     ${STRIGI_INCLUDE_DIR}
                   )

--- a/kcontrol/kfontinst/thumbnail/CMakeLists.txt
+++ b/kcontrol/kfontinst/thumbnail/CMakeLists.txt
@ -1,6 +1,6 @@

 include_directories(
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
+    ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart/
     )

 set(fontthumbnail_PART_SRCS FontThumbnail.cpp )
--- a/kcontrol/launch/CMakeLists.txt
+++ b/kcontrol/launch/CMakeLists.txt
@ -5,9 +5,9 @@

 set(kcm_launch_PART_SRCS kcmlaunch.cpp )

-set(kdesktop_xml  ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
+set(kdesktop_xml  ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 QT4_ADD_DBUS_INTERFACE( kcm_launch_PART_SRCS ${kdesktop_xml} krunner_interface )
-set(kwin_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
+set(kwin_xml ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
 set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h")
 QT4_ADD_DBUS_INTERFACE( kcm_launch_PART_SRCS ${kwin_xml} kwin_interface )

--- a/kcontrol/screensaver/CMakeLists.txt
+++ b/kcontrol/screensaver/CMakeLists.txt
@ -13,7 +13,7 @@ set(kcm_screensaver_PART_SRCS
   kswidget.cpp
   screensaver.ui)

-set(kscreensaver_xml  ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.kde.screensaver.xml)
+set(kscreensaver_xml  ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.kde.screensaver.xml)
 QT4_ADD_DBUS_INTERFACE( kcm_screensaver_PART_SRCS ${kscreensaver_xml} kscreensaver_interface )

 kde4_add_plugin(kcm_screensaver ${kcm_screensaver_PART_SRCS})
--- a/kcontrol/style/CMakeLists.txt
+++ b/kcontrol/style/CMakeLists.txt
@ -1,7 +1,7 @@
 # needed for including kdecoration.h
 include_directories (
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkdecorations
+    ${CMAKE_SOURCE_DIR}/kwin/libkwineffects
+    ${CMAKE_SOURCE_DIR}/kwin/libkdecorations
    ${KDEBASE_WORKSPACE_BINARY_DIR}/kwin/libkwineffects
 )

--- a/kdm/kfrontend/CMakeLists.txt
+++ b/kdm/kfrontend/CMakeLists.txt
@ -5,7 +5,7 @@ add_subdirectory(pics)
 add_subdirectory(sessions)

 include_directories(
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
+    ${CMAKE_SOURCE_DIR}/libs/kdm
    ${QIMAGEBLITZ_INCLUDES}
 )

--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@ -3,9 +3,9 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1207)
 # for dbus_add_activation_service
 include(PkgConfigGetVar)

-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard/processcore
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/plasmagenericshell)
+include_directories(${CMAKE_SOURCE_DIR}/libs/ksysguard
+                    ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore
+                    ${CMAKE_SOURCE_DIR}/libs/plasmagenericshell)

 set(krunner_KCFG_SRCS kcfg/krunnersettings.kcfgc kcfg/klaunchsettings.kcfgc)
 set(krunner_dbusAppXML dbus/org.kde.krunner.App.xml)
--- a/kscreensaver/kblank_screensaver/CMakeLists.txt
+++ b/kscreensaver/kblank_screensaver/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kscreensaver/libkscreensaver   )
+include_directories( ${CMAKE_SOURCE_DIR}/kscreensaver/libkscreensaver   )


 ########### next target ###############
--- a/kscreensaver/krandom_screensaver/CMakeLists.txt
+++ b/kscreensaver/krandom_screensaver/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kscreensaver/libkscreensaver   )
+include_directories( ${CMAKE_SOURCE_DIR}/kscreensaver/libkscreensaver   )


 ########### next target ###############
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@ -2,7 +2,7 @@
 add_subdirectory( kcm )

 include_directories(
-   ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
+   ${CMAKE_SOURCE_DIR}/libs
   ${KDECLARATIVE_INCLUDE_DIR}
 )

--- a/ksmserver/screenlocker/CMakeLists.txt
+++ b/ksmserver/screenlocker/CMakeLists.txt
@ -7,11 +7,11 @@ add_subdirectory(greeter)
 # for dbus_add_activation_service
 include(PkgConfigGetVar)

-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace)
+include_directories(${CMAKE_SOURCE_DIR}/libs/kworkspace)

 set(screensaver_dbusXML dbus/org.freedesktop.ScreenSaver.xml)
 set(kscreensaver_dbusXML dbus/org.kde.screensaver.xml)
-set(ksmserver_xml  ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+set(ksmserver_xml  ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 set(powerdevilpolicyagent_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Solid.PowerManagement.PolicyAgent.xml)

 set(ksld_SRCS
--- a/ksmserver/screenlocker/greeter/CMakeLists.txt
+++ b/ksmserver/screenlocker/greeter/CMakeLists.txt
@ -1,8 +1,8 @@
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcheckpass
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace
+    ${CMAKE_SOURCE_DIR}/kcheckpass
+    ${CMAKE_SOURCE_DIR}/libs/kdm
+    ${CMAKE_SOURCE_DIR}/libs/kworkspace
 )

 set(kscreenlocker_greet_SRCS
--- a/kstyles/oxygen/CMakeLists.txt
+++ b/kstyles/oxygen/CMakeLists.txt
@ -4,7 +4,7 @@ project(kstyle-oxygen)
 add_subdirectory( config )
 add_subdirectory( demo )

-include_directories (animations debug transitions ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
+include_directories (animations debug transitions ${CMAKE_SOURCE_DIR}/libs/oxygen)

 ########### next target ###############

--- a/kstyles/oxygen/config/CMakeLists.txt
+++ b/kstyles/oxygen/config/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories( ${KDE4_KDEUI_INCLUDES} ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
+include_directories( ${KDE4_KDEUI_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/oxygen)

 ########### next target ###############
 set(kstyle_oxygen_config_PART_SRCS
--- a/ksysguard/gui/CMakeLists.txt
+++ b/ksysguard/gui/CMakeLists.txt
@ -5,10 +5,10 @@ endif()

 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/SensorDisplayLib/
-   ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
-   ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard
-   ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard/signalplotter
-   ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard/processcore )
+   ${CMAKE_SOURCE_DIR}/libs
+   ${CMAKE_SOURCE_DIR}/libs/ksysguard
+   ${CMAKE_SOURCE_DIR}/libs/ksysguard/signalplotter
+   ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore )


 ########### next target ###############
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@ -148,9 +148,9 @@ qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Compositing.xml composite.h KWin::C
 qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )

 qt4_add_dbus_interface( kwin_SRCS
-  ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface)
+  ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface)
 qt4_add_dbus_interface( kwin_SRCS
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface)
+    ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface)

 qt4_add_resources( kwin_SRCS resources.qrc )

--- a/kwin/clients/oxygen/CMakeLists.txt
+++ b/kwin/clients/oxygen/CMakeLists.txt
@ -4,7 +4,7 @@ add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKA
 add_subdirectory( config )
 add_subdirectory( demo )

-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
+include_directories(${CMAKE_SOURCE_DIR}/libs/oxygen)

 ########### next target ###############
 set(kwin_oxygen_SRCS
--- a/kwin/clients/oxygen/config/CMakeLists.txt
+++ b/kwin/clients/oxygen/config/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
+include_directories( ${CMAKE_SOURCE_DIR}/libs/oxygen)

 set(kwin_oxygen_config_PART_SRCS
    oxygenconfig.cpp
--- a/kwin/clients/oxygen/demo/CMakeLists.txt
+++ b/kwin/clients/oxygen/demo/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
+include_directories(${CMAKE_SOURCE_DIR}/libs/oxygen)
 include_directories( ${KDE4_KDEUI_INCLUDES} )


--- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
@ -1,6 +1,6 @@
 ########### next target ###############

-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin )
+include_directories( ${CMAKE_SOURCE_DIR}/kwin )

 set(kcm_kwincompositing_PART_SRCS
    main.cpp
@ -8,7 +8,7 @@ set(kcm_kwincompositing_PART_SRCS
    main.ui
 )

-set(kwin_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
+set(kwin_xml ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
 set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h")
 QT4_ADD_DBUS_INTERFACE(kcm_kwincompositing_PART_SRCS ${kwin_xml} kwin_interface)
 kde4_add_plugin(kcm_kwincompositing ${kcm_kwincompositing_PART_SRCS})
--- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
@ -1,9 +1,9 @@
 # need a header file from Aurorae sources
 include_directories(
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/clients/aurorae/src/lib
+    ${CMAKE_SOURCE_DIR}/kwin/clients/aurorae/src/lib
 )

-set(AURORAE_SOURCE_DIR ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/clients/aurorae/src/lib/)
+set(AURORAE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/kwin/clients/aurorae/src/lib/)

 set(kcm_kwindecoration_PART_SRCS
    kwindecoration.cpp
--- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin )
+include_directories( ${CMAKE_SOURCE_DIR}/kwin )

 set(
    kcm_kwinscreenedges_PART_SRCS
--- a/kwin/kcmkwin/kwintabbox/CMakeLists.txt
+++ b/kwin/kcmkwin/kwintabbox/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox )
+include_directories( ${CMAKE_SOURCE_DIR}/kwin/tabbox )

 ########### next target ###############

@ -8,11 +8,11 @@ set(kcm_kwintabbox_PART_SRCS
    main.cpp
    layoutpreview.cpp
    thumbnailitem.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/clientmodel.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/declarative.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/desktopmodel.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/tabboxconfig.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/tabbox/tabboxhandler.cpp
+    ${CMAKE_SOURCE_DIR}/kwin/tabbox/clientmodel.cpp
+    ${CMAKE_SOURCE_DIR}/kwin/tabbox/declarative.cpp
+    ${CMAKE_SOURCE_DIR}/kwin/tabbox/desktopmodel.cpp
+    ${CMAKE_SOURCE_DIR}/kwin/tabbox/tabboxconfig.cpp
+    ${CMAKE_SOURCE_DIR}/kwin/tabbox/tabboxhandler.cpp
    main.ui
 )

--- a/libs/kdm/CMakeLists.txt
+++ b/libs/kdm/CMakeLists.txt
@ -1,5 +1,5 @@

-include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kdm/kfrontend  )
+include_directories( ${CMAKE_SOURCE_DIR}/kdm/kfrontend  )

 ########### next target ###############

--- a/libs/kworkspace/CMakeLists.txt
+++ b/libs/kworkspace/CMakeLists.txt
@ -6,10 +6,10 @@ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
   )


-set(ksmserver_xml  ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+set(ksmserver_xml  ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 qt4_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )

-set(kwin_xml  ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
+set(kwin_xml  ${CMAKE_SOURCE_DIR}/kwin/org.kde.KWin.xml)

 set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h")

--- a/libs/plasmaclock/CMakeLists.txt
+++ b/libs/plasmaclock/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
+include_directories(${CMAKE_SOURCE_DIR}/libs/kephal)

 set(plasmaclock_LIB_SRCS
    clockapplet.cpp
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@ -1,5 +1,5 @@
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
+include_directories(${CMAKE_SOURCE_DIR}/libs/kephal)

 ########### next target ###############

--- a/plasma/desktop/applets/kickoff/CMakeLists.txt
+++ b/plasma/desktop/applets/kickoff/CMakeLists.txt
@ -20,11 +20,11 @@ set(libkickoff_SRCS
 qt4_add_dbus_adaptor(libkickoff_SRCS core/org.kde.kickoff.xml core/applicationmodel.h Kickoff::ApplicationModel)
 qt4_add_dbus_adaptor(libkickoff_SRCS core/org.kde.kickoff.recent.xml core/recentlyusedmodel.h Kickoff::RecentlyUsedModel)

-set(screensaver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+set(screensaver_xml ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
 QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${screensaver_xml} screensaver_interface)
-set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
+set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${krunner_xml} krunner_interface)
-set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${ksmserver_xml} ksmserver_interface)

 set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspace)
--- a/plasma/desktop/containments/desktop/CMakeLists.txt
+++ b/plasma/desktop/containments/desktop/CMakeLists.txt
@ -3,7 +3,7 @@ set(desktop_SRCS
    itemspace.cpp
    desktoplayout.cpp)

-set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
+set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 QT4_ADD_DBUS_INTERFACE(desktop_SRCS ${krunner_xml} krunner_interface)

 kde4_add_plugin(plasma_containment_desktop ${desktop_SRCS})
--- a/plasma/desktop/containments/panel/CMakeLists.txt
+++ b/plasma/desktop/containments/panel/CMakeLists.txt
@ -3,7 +3,7 @@ set(panel_SRCS
    panel.cpp)

 include_directories(
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
+    ${CMAKE_SOURCE_DIR}/libs/kephal)

 kde4_add_plugin(plasma_containment_panel ${panel_SRCS})
 target_link_libraries(plasma_containment_panel ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} kephal)
--- a/plasma/desktop/shell/CMakeLists.txt
+++ b/plasma/desktop/shell/CMakeLists.txt
@ -1,7 +1,7 @@
-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs 
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/plasmagenericshell
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/plasma/desktop/shell/scripting
-                    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal
+include_directories(${CMAKE_SOURCE_DIR}/libs 
+                    ${CMAKE_SOURCE_DIR}/libs/plasmagenericshell
+                    ${CMAKE_SOURCE_DIR}/plasma/desktop/shell/scripting
+                    ${CMAKE_SOURCE_DIR}/libs/kephal
 )

 set(plasma_SRCS
@ -32,7 +32,7 @@ kde4_add_kcfg_files(plasma_SRCS data/plasma-shell-desktop.kcfgc)
 set(plasmaapp_dbusXML dbus/org.kde.plasma.App.xml)
 qt4_add_dbus_adaptor(plasma_SRCS ${plasmaapp_dbusXML} plasmaapp.h PlasmaApp)

-set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 qt4_add_dbus_interface(plasma_SRCS ${ksmserver_xml} ksmserver_interface)

 add_executable(plasma-desktop ${plasma_SRCS})
--- a/plasma/generic/containmentactions/contextmenu/CMakeLists.txt
+++ b/plasma/generic/containmentactions/contextmenu/CMakeLists.txt
@ -4,10 +4,10 @@ set(contextmenu_SRCS
    menu.cpp
 )

-set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
+set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 QT4_ADD_DBUS_INTERFACE(contextmenu_SRCS ${krunner_xml} krunner_interface)

-set(screensaver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+set(screensaver_xml ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
 QT4_ADD_DBUS_INTERFACE(contextmenu_SRCS ${screensaver_xml} screensaver_interface)


--- a/plasma/generic/dataengines/powermanagement/CMakeLists.txt
+++ b/plasma/generic/dataengines/powermanagement/CMakeLists.txt
@ -5,7 +5,7 @@ set(powermanagement_engine_SRCS
    powermanagementservice.cpp
 )

-set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
+set(krunner_xml ${CMAKE_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 QT4_ADD_DBUS_INTERFACE(powermanagement_engine_SRCS ${krunner_xml} krunner_interface)

 kde4_add_plugin(plasma_engine_powermanagement ${powermanagement_engine_SRCS})
--- a/plasma/generic/dataengines/statusnotifieritem/CMakeLists.txt
+++ b/plasma/generic/dataengines/statusnotifieritem/CMakeLists.txt
@ -1,6 +1,6 @@
 project(plasma-statusnotifieritem_engine)

-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/statusnotifierwatcher)
+include_directories(${CMAKE_SOURCE_DIR}/statusnotifierwatcher)
 include_directories(${DBUSMENUQT_INCLUDE_DIR})

 # We add our source code here
--- a/plasma/generic/runners/sessions/CMakeLists.txt
+++ b/plasma/generic/runners/sessions/CMakeLists.txt
@ -2,7 +2,7 @@ set(krunner_sessions_SRCS
    sessionrunner.cpp
 )

-set(screensaver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+set(screensaver_xml ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
 QT4_ADD_DBUS_INTERFACE(krunner_sessions_SRCS ${screensaver_xml} screensaver_interface)

 kde4_add_plugin(krunner_sessions ${krunner_sessions_SRCS})
--- a/plasma/generic/shells/plasma-windowed/CMakeLists.txt
+++ b/plasma/generic/shells/plasma-windowed/CMakeLists.txt
@ -1,4 +1,4 @@
-include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace)
+include_directories(${CMAKE_SOURCE_DIR}/libs ${CMAKE_SOURCE_DIR}/libs/kworkspace)


 set(plasma-windowed_SRCS
--- a/plasma/generic/wallpapers/image/CMakeLists.txt
+++ b/plasma/generic/wallpapers/image/CMakeLists.txt
@ -11,7 +11,7 @@ set(image_SRCS
    slideshowconfig.ui
 )

-set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+set(ksmserver_xml ${CMAKE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface)

 kde4_add_plugin(plasma_wallpaper_image ${image_SRCS})
--- a/plasma/screensaver/shell/CMakeLists.txt
+++ b/plasma/screensaver/shell/CMakeLists.txt
@ -1,11 +1,11 @@
 include_directories(
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/plasmagenericshell
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/greeter/
+    ${CMAKE_SOURCE_DIR}/libs
+    ${CMAKE_SOURCE_DIR}/libs/kdm
+    ${CMAKE_SOURCE_DIR}/libs/plasmagenericshell
+    ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/greeter/
    ${CMAKE_BINARY_DIR}/ksmserver/screenlocker/greeter/
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcheckpass
+    ${CMAKE_SOURCE_DIR}/libs/kworkspace
+    ${CMAKE_SOURCE_DIR}/kcheckpass
 )

 set(plasma-overlay_SRCS
@ -14,12 +14,12 @@ set(plasma-overlay_SRCS
    plasmaapp.cpp
    savercorona.cpp
    saverview.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/greeter/greeter.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/greeter/sessions.cpp
+    ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/greeter/greeter.cpp
+    ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/greeter/sessions.cpp
    BackgroundDialog.ui
 )

-kde4_add_kcfg_files(plasma-overlay_SRCS ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/kcfg/kscreensaversettings.kcfgc)
+kde4_add_kcfg_files(plasma-overlay_SRCS ${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/kcfg/kscreensaversettings.kcfgc)

 set(plasmaapp_dbusXML org.kde.plasma-overlay.App.xml)
 #qt4_generate_dbus_interface(plasmaapp.h ${plasmaapp_dbusXML} OPTIONS -S -M)
--- a/powerdevil/daemon/CMakeLists.txt
+++ b/powerdevil/daemon/CMakeLists.txt
@ -27,7 +27,7 @@ set(powerdevilcore_SRCS

 kde4_add_kcfg_files(powerdevilcore_SRCS ../PowerDevilSettings.kcfgc)

-set(screensaver_xml "${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml")
+set(screensaver_xml "${CMAKE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml")
 qt4_add_dbus_interface(powerdevilcore_SRCS ${screensaver_xml} screensaver_interface )

 # Action DBus Adaptors