diff --git a/CMakeLists.txt b/CMakeLists.txt index 57d4a030b..0dcf36c3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,130 +166,6 @@ if(QCA2_FOUND) endif(QCA2_FOUND) -# # Those variables for are only valid inside of kdelibs, of course. -# # Use the one variable for the lib you depend upon. -# # E.g. kdeui uses ${KDE4_KDECORE_INCLUDES}. Something that depends on kparts uses ${KDE4_KPARTS_INCLUDES}. -# -# set(KDE4_KJS_INCLUDES ${CMAKE_SOURCE_DIR}/tier1/kjs/src/kjs -# ${CMAKE_BINARY_DIR}/tier1/kjs/src/kjs -# ${CMAKE_SOURCE_DIR}/tier1/kjs/src -# ${CMAKE_BINARY_DIR}/tier1/kjs/src -# ) -# -# if(NOT WINCE) -# set(KDE4_KDECORE_INCLUDES ${KDE4_KJS_INCLUDES} ) -# endif(NOT WINCE) -# -# set(KDE4_KCONFIG_INCLUDES ${CMAKE_SOURCE_DIR}/kdecore/config -# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/io # for kurl.h -# ${CMAKE_BINARY_DIR}/tier1/kcoreaddons/src -# ) -# # kdecore depends on Qt and kcoreaddons (need only headers from kjs) -# set(KDE4_KDECORE_INCLUDES ${KDE4_KDECORE_INCLUDES} -# ${CMAKE_SOURCE_DIR}/kdecore -# ${CMAKE_BINARY_DIR}/kdecore -# ${CMAKE_SOURCE_DIR}/kdecore/compression -# ${CMAKE_SOURCE_DIR}/kdecore/config -# ${CMAKE_SOURCE_DIR}/kdecore/date -# ${CMAKE_SOURCE_DIR}/kdecore/io -# ${CMAKE_SOURCE_DIR}/kdecore/kernel -# ${CMAKE_SOURCE_DIR}/kdecore/network -# ${CMAKE_SOURCE_DIR}/kdecore/services -# ${CMAKE_SOURCE_DIR}/kdecore/localization -# ${CMAKE_SOURCE_DIR}/kdecore/sycoca -# ${CMAKE_SOURCE_DIR}/kdecore/text -# ${CMAKE_SOURCE_DIR}/kdecore/util -# ${CMAKE_SOURCE_DIR}/kdecore/sonnet -# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/io -# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/kernel -# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/jobs -# ${CMAKE_SOURCE_DIR}/tier1/kcodecs/src -# ${CMAKE_BINARY_DIR}/tier1/kcodecs/src -# ${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/text -# ${CMAKE_BINARY_DIR}/tier1/kcoreaddons/src -# ${CMAKE_BINARY_DIR}/tier2/kconfig/src/core -# ${CMAKE_SOURCE_DIR}/tier2/kconfig/src/core -# ${CMAKE_BINARY_DIR}/staging/kservice/src/ -# ${CMAKE_SOURCE_DIR}/staging/kservice/src/sycoca -# ${CMAKE_SOURCE_DIR}/staging/kservice/src/services -# ${CMAKE_SOURCE_DIR}/staging/kservice/src/plugin -# ${QT_INCLUDES} -# ${_KDE4_PLATFORM_INCLUDE_DIRS}) -# -# include_directories(${CMAKE_SOURCE_DIR}/tier1/kcoreaddons/src/kernel) # For QLocalizedString -# -# # kdeui depends on kdecore -# set(KDE4_KDEUI_INCLUDES ${CMAKE_SOURCE_DIR}/kdeui -# ${CMAKE_BINARY_DIR}/kdeui -# ${CMAKE_SOURCE_DIR}/kdeui/actions -# ${CMAKE_SOURCE_DIR}/kdeui/colors -# ${CMAKE_SOURCE_DIR}/kdeui/config -# ${CMAKE_SOURCE_DIR}/kdeui/dialogs -# ${CMAKE_SOURCE_DIR}/kdeui/findreplace -# ${CMAKE_SOURCE_DIR}/kdeui/fonts -# ${CMAKE_SOURCE_DIR}/kdeui/icons -# ${CMAKE_SOURCE_DIR}/kdeui/itemviews -# ${CMAKE_SOURCE_DIR}/kdeui/jobs -# ${CMAKE_SOURCE_DIR}/kdeui/kernel -# ${CMAKE_SOURCE_DIR}/kdeui/notifications -# ${CMAKE_SOURCE_DIR}/kdeui/paged -# ${CMAKE_SOURCE_DIR}/kdeui/plotting -# ${CMAKE_SOURCE_DIR}/kdeui/shortcuts -# ${CMAKE_SOURCE_DIR}/kdeui/sonnet -# ${CMAKE_SOURCE_DIR}/kdeui/util -# ${CMAKE_SOURCE_DIR}/kdeui/widgets -# ${CMAKE_SOURCE_DIR}/kdeui/windowmanagement -# ${CMAKE_SOURCE_DIR}/kdeui/xmlgui -# ${CMAKE_BINARY_DIR}/tier1/kwindowsystem/src -# ${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/src -# ${CMAKE_BINARY_DIR}/tier2/kauth/src/ -# ${CMAKE_SOURCE_DIR}/tier2/kauth/src/ -# ${CMAKE_BINARY_DIR}/tier2/kconfig/src/gui -# ${CMAKE_SOURCE_DIR}/tier2/kconfig/src/gui -# ${CMAKE_BINARY_DIR}/staging/kguiaddons/src/ -# ${CMAKE_SOURCE_DIR}/staging/kguiaddons/src/colors -# ${CMAKE_BINARY_DIR}/staging/kwidgets/src -# ${CMAKE_SOURCE_DIR}/staging/kwidgets/src/utils -# ${CMAKE_SOURCE_DIR}/staging/kwidgets/src/icons -# ${CMAKE_SOURCE_DIR}/staging/kwidgets/src/widgets -# ${CMAKE_SOURCE_DIR}/staging/kwidgets/src/dialogs -# ${CMAKE_BINARY_DIR}/staging/kde4support/src/ -# ${CMAKE_SOURCE_DIR}/staging/kde4support/src/kdeui -# ${KDE4_KDECORE_INCLUDES}) -# -# # kio depends on kdeui -# set(KDE4_KIO_INCLUDES ${CMAKE_SOURCE_DIR}/kio -# ${CMAKE_BINARY_DIR}/kio -# ${CMAKE_BINARY_DIR}/kio/misc/kntlm -# ${CMAKE_SOURCE_DIR}/kio/bookmarks -# ${CMAKE_SOURCE_DIR}/kio/kio -# ${CMAKE_SOURCE_DIR}/kio/kfile -# ${CMAKE_BINARY_DIR}/staging/kio/src/include -# ${CMAKE_SOURCE_DIR}/staging/kio/src/core -# ${CMAKE_BINARY_DIR}/staging/kio/src/core -# ${CMAKE_SOURCE_DIR}/staging/kio/src/widgets -# ${CMAKE_BINARY_DIR}/staging/kio/src/widgets -# ${KDE4_KDEUI_INCLUDES}) -# -# # kpty -# set(KDE4_KPTY_INCLUDES ${CMAKE_SOURCE_DIR}/kpty ${CMAKE_BINARY_DIR}/kpty ${KDE4_KIO_INCLUDES} ) -# -# # kparts depends on kio -# set(KDE4_KPARTS_INCLUDES ${CMAKE_SOURCE_DIR}/kparts -# ${CMAKE_BINARY_DIR}/kparts -# ${KDE4_KIO_INCLUDES}) -# -# # kde3support depends on kparts -# set(KDE4_KDE3SUPPORT_INCLUDES ${CMAKE_SOURCE_DIR}/kde3support -# ${CMAKE_SOURCE_DIR}/kde3support/kdecore -# ${CMAKE_SOURCE_DIR}/kde3support/kdeui -# ${CMAKE_SOURCE_DIR}/kde3support/kio -# ${KDE4_KPARTS_INCLUDES}) -# -# if(NOT WINCE) -# set(KDE4_KHTML_INCLUDES ${CMAKE_SOURCE_DIR}/khtml) -# endif(NOT WINCE) - ################# configure checks and create the configured files ################# diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index b7ab30aa6..708ffe17b 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -28,21 +28,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE -# ${KDE4_KDEUI_INCLUDES} -# ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative -# ${CMAKE_BINARY_DIR}/experimental/libkdeclarative -# ${karchive_SOURCE_DIR}/src -# ${karchive_BINARY_DIR}/src -# ${CMAKE_SOURCE_DIR}/tier2/kauth/src/ -# ${CMAKE_BINARY_DIR}/tier2/kauth/src/ -# ${CMAKE_SOURCE_DIR}/tier1/threadweaver/src -# ${CMAKE_BINARY_DIR}/tier1/threadweaver/src -# ${CMAKE_BINARY_DIR}/tier1/threadweaver/src/Weaver -# ${CMAKE_SOURCE_DIR}/tier1/kwindowsystem/ -# ${CMAKE_BINARY_DIR}/tier1/kwindowsystem/ -# ${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/private/qtjolie-branch/qtjolie ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch @@ -60,14 +45,10 @@ if(NOT PLASMA_NO_KIO) endif(NOT PLASMA_NO_KIO) if(NOT PLASMA_NO_KNEWSTUFF) - include_directories(${CMAKE_SOURCE_DIR}/knewstuff/) - include_directories(${CMAKE_BINARY_DIR}/knewstuff/) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} knewstuff3) endif(NOT PLASMA_NO_KNEWSTUFF) if(NOT PLASMA_NO_SOLID) - include_directories(${CMAKE_BINARY_DIR}/tier1/solid/) - include_directories(${CMAKE_SOURCE_DIR}/tier1/solid/) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${solid_LIBRARIES}) endif(NOT PLASMA_NO_SOLID) @@ -77,8 +58,6 @@ if(NOT PLASMA_NO_PACKAGEKIT) endif(NOT PLASMA_NO_PACKAGEKIT) if (NOT PLASMA_NO_KUTILS) - include_directories(${CMAKE_SOURCE_DIR}/kutils) - include_directories(${CMAKE_BINARY_DIR}/kutils) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS}) endif(NOT PLASMA_NO_KUTILS)