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

don't build the qgv library anymore

Browse Source
This commit is contained in:
Marco Martin 2012-09-24 18:24:59 +02:00
parent 16ee068aba
commit 1cf7a6214c
1 changed files with 64 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
CMakeLists.txt
View File

@ -188,8 +188,6 @@ set(plasma_LIB_SRCS
private/qtjolie-branch/qtjolie/serverthread.cpp
#FIXME: all these must move into the qgv library
#private/themedwidgetinterface.cpp
#widgets/iconwidget.cpp
#view.cpp
applet.cpp
containment.cpp
@ -199,65 +197,70 @@ set(plasma_LIB_SRCS
#popupapplet.cpp
)
set (plasmaqgv_LIB_SRCS
private/applethandle.cpp
abstracttoolbox.cpp
delegate.cpp
#FIXME: this is duplicated with libplasma because iconwidget requires it!
private/themedwidgetinterface.cpp
graphicsview/private/graphicsviewappletprivate.cpp
animator.cpp
animations/animation.cpp
animations/easinganimation.cpp
animations/fade.cpp
animations/grow.cpp
animations/pendulumcurve.cpp
animations/pixmaptransition.cpp
animations/pulser.cpp
animations/rotation.cpp
animations/rotationstacked.cpp
animations/slide.cpp
animations/stackedlayout.cpp
animations/geometry.cpp
animations/widgetsnapshot.cpp
animations/zoom.cpp
private/declarative/declarativenetworkaccessmanagerfactory.cpp
private/declarative/dataenginebindings.cpp
graphicsview/private/animablegraphicswebview.cpp
graphicsview/private/focusindicator.cpp
graphicsview/private/nativetabbar.cpp
graphicsview/private/style.cpp
graphicsview/private/kineticscroll.cpp
widgets/label.cpp
widgets/scrollbar.cpp
widgets/svgwidget.cpp
widgets/scrollwidget.cpp
widgets/textedit.cpp
widgets/textbrowser.cpp
widgets/busywidget.cpp
widgets/checkbox.cpp
widgets/combobox.cpp
widgets/declarativewidget.cpp
widgets/flashinglabel.cpp
widgets/frame.cpp
widgets/groupbox.cpp
widgets/itembackground.cpp
widgets/lineedit.cpp
widgets/meter.cpp
widgets/pushbutton.cpp
widgets/radiobutton.cpp
widgets/signalplotter.cpp
widgets/slider.cpp
widgets/spinbox.cpp
widgets/toolbutton.cpp
widgets/separator.cpp
widgets/tabbar.cpp
widgets/treeview.cpp
widgets/webview.cpp
)
#TODO: all those files will have to be deleted
# set (plasmaqgv_LIB_SRCS
# private/applethandle.cpp
# abstracttoolbox.cpp
# delegate.cpp
# dialog.cpp
# view.cpp
# private/themedwidgetinterface.cpp
# widgets/iconwidget.cpp
# #FIXME: this is duplicated with libplasma because iconwidget requires it!
# private/themedwidgetinterface.cpp
#
# graphicsview/private/graphicsviewappletprivate.cpp
# animator.cpp
# animations/animation.cpp
# animations/easinganimation.cpp
# animations/fade.cpp
# animations/grow.cpp
# animations/pendulumcurve.cpp
# animations/pixmaptransition.cpp
# animations/pulser.cpp
# animations/rotation.cpp
# animations/rotationstacked.cpp
# animations/slide.cpp
# animations/stackedlayout.cpp
# animations/geometry.cpp
# animations/widgetsnapshot.cpp
# animations/zoom.cpp
#
# private/declarative/declarativenetworkaccessmanagerfactory.cpp
# private/declarative/dataenginebindings.cpp
# graphicsview/private/animablegraphicswebview.cpp
# graphicsview/private/focusindicator.cpp
# graphicsview/private/nativetabbar.cpp
# graphicsview/private/style.cpp
# graphicsview/private/kineticscroll.cpp
#
# widgets/label.cpp
# widgets/scrollbar.cpp
# widgets/svgwidget.cpp
# widgets/scrollwidget.cpp
# widgets/textedit.cpp
# widgets/textbrowser.cpp
# widgets/busywidget.cpp
# widgets/checkbox.cpp
# widgets/combobox.cpp
# widgets/declarativewidget.cpp
# widgets/flashinglabel.cpp
# widgets/frame.cpp
# widgets/groupbox.cpp
# widgets/itembackground.cpp
# widgets/lineedit.cpp
# widgets/meter.cpp
# widgets/pushbutton.cpp
# widgets/radiobutton.cpp
# widgets/signalplotter.cpp
# widgets/slider.cpp
# widgets/spinbox.cpp
# widgets/toolbutton.cpp
# widgets/separator.cpp
# widgets/tabbar.cpp
# widgets/treeview.cpp
# widgets/webview.cpp
# )
kconfig_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc)
@ -273,28 +276,14 @@ kde4_add_ui_files(plasma_LIB_SRCS
#)
if (PHONON_FOUND)
message(STATUS "Adding support for Phonon to libplasma")
include_directories(${KDE4_PHONON_INCLUDES})
set(plasmaqgv_LIB_SRCS
${plasmaqgv_LIB_SRCS}
widgets/videowidget.cpp)
endif(PHONON_FOUND)
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
kde4_add_library(plasmaqgv ${LIBRARY_TYPE} ${plasmaqgv_LIB_SRCS})
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} kdnssd threadweaver kauth kwindowsystem ${PLASMA_EXTRA_LIBS} kcoreaddons ${QtMimeTypes_LIBRARY})
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative karchive)
target_link_libraries(plasmaqgv plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KDEUI_LIBS} kdeclarative ${PLASMA_EXTRA_LIBS} kcoreaddons ${QtMimeTypes_LIBRARY})
if(QCA2_FOUND)
target_link_libraries(plasma ${QCA2_LIBRARIES})
endif(QCA2_FOUND)
@ -303,10 +292,6 @@ if(X11_FOUND)
target_link_libraries(plasma ${X11_LIBRARIES})
endif(X11_FOUND)
if(PHONON_FOUND)
target_link_libraries(plasmaqgv ${KDE4_PHONON_LIBS})
endif(PHONON_FOUND)
if(DL_LIBRARY)
target_link_libraries(plasma ${DL_LIBRARY})
endif(DL_LIBRARY)
@ -319,13 +304,7 @@ set_target_properties(plasma PROPERTIES
SOVERSION 4
)
set_target_properties(plasmaqgv PROPERTIES
VERSION 1.0.0
SOVERSION 1
)
install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
generate_export_header(plasma)