On 9/2/09, Kevin Ottens <er...@kde.org> wrote:
> SVN commit 1018772 by ervin:
>
> Make it build by importing all the mouse plugin stuff from the desktop
> shell. IIRC that's the second time we need to do something like that to fix
> the build when someone starts using code from shells/common.
>
> There's some dependency problem there. It really needs to be fixed.
>
> CCMAIL: plasma-devel@kde.org
>
yes, this is really messy (and me is punishing himself with a nine
tail cat right now for that :/)
what we were thinking to do is reorganizing the filesystem under
plasma to make it more clear, something like:
plasma
|-desktop
| |-applets
| |-containments
| `-shells
|-netbook
| `-the whole hierarchy again there
|-common
|-wallpapers?
|-scriptengine?
`-libplasma-workspace
libplasma-workspace is mostly what there is in common, should be
something that builds by itself, maybe not static as now but a private
dynamic library?
opinions?
Cheers,
Marco "sorry for screwing trunk at 5 am" Martin
>
> M +5 -2 CMakeLists.txt
>
>
> --- trunk/KDE/kdebase/workspace/plasma/netbook/shells/netbook/CMakeLists.txt
> #1018771:1018772
> @@ -1,4 +1,4 @@
> -include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
> ../../../shells/common ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace)
> +include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs
> ../../../shells/desktop ../../../shells/common
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace)
>
> set(appletbrowserdialog_SRCS
> ../../../shells/common/widgetsExplorer/kcategorizeditemsviewmodels.cpp
> @@ -19,10 +19,13 @@
> main.cpp
> plasmaapp.cpp
> ../../../shells/common/backgrounddialog.cpp
> + ../../../shells/desktop/mouseplugins.cpp
> + ../../../shells/desktop/mousepluginwidget.cpp
> + ../../../shells/desktop/mouseinputbutton.cpp
> ${appletbrowserdialog_SRCS}
> )
>
> -kde4_add_ui_files(plasma-netbook_SRCS
> ../../../shells/common/BackgroundDialog.ui
> ../../../shells/common/ActivityConfiguration.ui )
> +kde4_add_ui_files(plasma-netbook_SRCS
> ../../../shells/common/BackgroundDialog.ui
> ../../../shells/common/ActivityConfiguration.ui
> ../../../shells/desktop/MousePlugins.ui
> ../../../shells/desktop/MousePluginWidget.ui)
>
> #set(ksmserver_xml
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
> set(ksmserver_xml
> ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSMServerInterface.xml)
> _______________________________________________
> Plasma-devel mailing list
> Plasma-devel@kde.org
> https://mail.kde.org/mailman/listinfo/plasma-devel
>
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
