diff --git a/CMakeLists.txt b/CMakeLists.txt index 3effae145..68c7307ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_KDEUI_INCLUDES} ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative ${CMAKE_BINARY_DIR}/experimental/libkdeclarative - ${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/threadweaver ${CMAKE_SOURCE_DIR}/plasma/extenders ${CMAKE_SOURCE_DIR}/plasma/remote @@ -44,6 +43,11 @@ if(NOT PLASMA_NO_SOLID) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) endif(NOT PLASMA_NO_SOLID) +if (NOT PLASMA_NO_KUTILS) + include_directories(${CMAKE_SOURCE_DIR}/kutils) + set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS}) +endif(NOT PLASMA_NO_KUTILS) + if(QCA2_FOUND) include_directories(${QCA2_INCLUDE_DIR}) set(ENABLE_REMOTE_WIDGETS TRUE) @@ -263,7 +267,7 @@ kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) #add kdeclarative after the 4.7 release target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS}) + ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS}) if(QCA2_FOUND) target_link_libraries(plasma ${QCA2_LIBRARIES}) diff --git a/applet.cpp b/applet.cpp index edafe2f6e..c99cdecaa 100644 --- a/applet.cpp +++ b/applet.cpp @@ -69,6 +69,8 @@ #ifndef PLASMA_NO_KUTILS #include #include +#else +#include #endif #ifndef PLASMA_NO_SOLID diff --git a/config-plasma.h.cmake b/config-plasma.h.cmake index 5edfe18a3..ebce7422b 100644 --- a/config-plasma.h.cmake +++ b/config-plasma.h.cmake @@ -5,4 +5,5 @@ #cmakedefine PLASMA_NO_KNEWSTUFF #cmakedefine PLASMA_NO_SOLID #cmakedefine PLASMA_NO_KIO +#cmakedefine PLASMA_NO_KUTILS