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

for 4.7 don't link to kdeclarative

Browse Source 
since kdeclarative is experimental, for 4.7 build it directly into libplasma instead of dynamically linking to it
This commit is contained in:
Marco Martin 2011-06-08 15:40:06 +02:00
parent 41211c2536
commit 97af96221e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -205,6 +205,15 @@ set(plasma_LIB_SRCS
private/qtjolie-branch/qtjolie/pendingreply.cpp private/qtjolie-branch/qtjolie/pendingreply.cpp
private/qtjolie-branch/qtjolie/server.cpp private/qtjolie-branch/qtjolie/server.cpp
private/qtjolie-branch/qtjolie/serverthread.cpp private/qtjolie-branch/qtjolie/serverthread.cpp
#Temporary solution to not link to libkdeclarative
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/kdeclarative.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/private/engineaccess.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/private/kiconprovider.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/qscriptnonguibookkeeping.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/i18n.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/icon.cpp
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/url.cpp
) )
if(NOT KDE_NO_DEPRECATED) if(NOT KDE_NO_DEPRECATED)
@ -245,9 +254,10 @@ endif(PHONON_FOUND)
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) 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} 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} kdnssd threadweaver kdeclarative ${PLASMA_EXTRA_LIBS}) ${KDE4_KDEUI_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS})
if(QCA2_FOUND) if(QCA2_FOUND)
target_link_libraries(plasma ${QCA2_LIBRARIES}) target_link_libraries(plasma ${QCA2_LIBRARIES})