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

Merge branch 'KDE/4.7' into ksecretsservice

Browse Source
This commit is contained in:
Valentin Rusu 2011-11-06 12:35:55 +01:00
commit 36bb121f93
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -14,7 +14,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_KDEUI_INCLUDES} ${KDE4_KDEUI_INCLUDES}
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
${CMAKE_BINARY_DIR}/experimental/libkdeclarative ${CMAKE_BINARY_DIR}/experimental/libkdeclarative
${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/threadweaver ${CMAKE_SOURCE_DIR}/threadweaver
${CMAKE_SOURCE_DIR}/plasma/extenders ${CMAKE_SOURCE_DIR}/plasma/extenders
${CMAKE_SOURCE_DIR}/plasma/remote ${CMAKE_SOURCE_DIR}/plasma/remote
@ -44,6 +43,11 @@ if(NOT PLASMA_NO_SOLID)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
endif(NOT PLASMA_NO_SOLID) 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) if(QCA2_FOUND)
include_directories(${QCA2_INCLUDE_DIR}) include_directories(${QCA2_INCLUDE_DIR})
set(ENABLE_REMOTE_WIDGETS TRUE) 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 #add kdeclarative after the 4.7 release
target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} 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} ${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) if(QCA2_FOUND)
target_link_libraries(plasma ${QCA2_LIBRARIES}) target_link_libraries(plasma ${QCA2_LIBRARIES})

2
applet.cpp
View File

@ -69,6 +69,8 @@
#ifndef PLASMA_NO_KUTILS #ifndef PLASMA_NO_KUTILS
#include <kcmoduleinfo.h> #include <kcmoduleinfo.h>
#include <kcmoduleproxy.h> #include <kcmoduleproxy.h>
#else
#include <kcmodule.h>
#endif #endif
#ifndef PLASMA_NO_SOLID #ifndef PLASMA_NO_SOLID

1
config-plasma.h.cmake
View File

@ -5,4 +5,5 @@
#cmakedefine PLASMA_NO_KNEWSTUFF #cmakedefine PLASMA_NO_KNEWSTUFF
#cmakedefine PLASMA_NO_SOLID #cmakedefine PLASMA_NO_SOLID
#cmakedefine PLASMA_NO_KIO #cmakedefine PLASMA_NO_KIO
#cmakedefine PLASMA_NO_KUTILS