KDE/kdebase

[Michael Jansen]

from workspace/kworkspace/CMakeLists.txt

[...]

qt4_add_dbus_interface(
    kworkspace_LIB_SRCS
    ${KDEBASE_RUNTIME_SOURCE_DIR}/activitymanager/org.kde.ActivityManager.xml
    activitymanager_interface
)

qt4_add_dbus_interface(
    kworkspace_LIB_SRCS
    ${KDEBASE_RUNTIME_SOURCE_DIR}/nepomuk/services/activities/org.kde.nepomuk.ActivitiesService.xml
    nepomukactivitiesservice_interface
)

[...]


That won't work either. Install the files and get them from the installated location.


We have KDE4_DBUS_INTERFACES_DIR, where most of the CMakeLists.txt get the files from and
DBUS_INTERFACES_INSTALL_DIR where most of them install to. Which leads me to the assumption they 
have the same content.

So kde-buildsystem. Which one to use?

MIke




On Tuesday 04 May 2010 18:20:43 Ivan Čukić wrote:
> SVN commit 1122763 by ivan:
> 
> Moving activities classes and services from kdereview to kdebase
> 
> New classes:
>  - KActivityInfo
>  - KActivityConsumer
>  - KActivityController
> 
> New services:
>  - activities manager kded module
>  - nepomuk activities backend service
> 
> 
> 
>  M  +1 -0      runtime/CMakeLists.txt
>  A             runtime/activitymanager (directory)
>  A             runtime/activitymanager/CMakeLists.txt
>  A             runtime/activitymanager/activitymanager.cpp   [License: LGPL
> (v2)] A             runtime/activitymanager/activitymanager.desktop
>  A             runtime/activitymanager/activitymanager.h   [License: LGPL
> (v2)] A             runtime/activitymanager/org.kde.ActivityManager.xml M 
> +2 -0      runtime/nepomuk/services/CMakeLists.txt
>  A             runtime/nepomuk/services/activities (directory)
>  A             runtime/nepomuk/services/activities/CMakeLists.txt
>  A            
> runtime/nepomuk/services/activities/nepomukactivitiesservice.cpp  
> [License: LGPL (v2)] A            
> runtime/nepomuk/services/activities/nepomukactivitiesservice.desktop A    
>         runtime/nepomuk/services/activities/nepomukactivitiesservice.h  
> [License: LGPL (v2)] A            
> runtime/nepomuk/services/activities/org.kde.nepomuk.ActivitiesService.xml
> M  +51 -1     workspace/libs/kworkspace/CMakeLists.txt
>  A             workspace/libs/kworkspace/kactivityconsumer.cpp   [License:
> LGPL (v2)] A             workspace/libs/kworkspace/kactivityconsumer.h  
> [License: LGPL (v2)] A            
> workspace/libs/kworkspace/kactivitycontroller.cpp   [License: LGPL (v2)] A
>             workspace/libs/kworkspace/kactivitycontroller.h   [License:
> LGPL (v2)] A            
> workspace/libs/kworkspace/kactivitycontrollerdbus_p.cpp   [License: LGPL
> (v2)] A             workspace/libs/kworkspace/kactivitycontrollerdbus_p.h 
>  [License: LGPL (v2)] A            
> workspace/libs/kworkspace/kactivityinfo.cpp   [License: LGPL (v2)] A      
>       workspace/libs/kworkspace/kactivityinfo.h   [License: LGPL (v2)] A  
>           workspace/libs/kworkspace/kactivityinfo_p.h   [License: LGPL
> (v2)] A            
> workspace/libs/kworkspace/org.kde.ActivityController.xml
> 
> 
> --- trunk/KDE/kdebase/runtime/CMakeLists.txt #1122762:1122763
> @@ -58,6 +58,7 @@
>  add_subdirectory(ktimezoned)
>  add_subdirectory(kuiserver)
>  add_subdirectory(kwalletd)
> +add_subdirectory(activitymanager)
>  if ( UNIX )
>     add_subdirectory(soliduiserver)
>     add_subdirectory(solidautoeject)
> --- trunk/KDE/kdebase/runtime/nepomuk/services/CMakeLists.txt
> #1122762:1122763 @@ -5,3 +5,5 @@
>  add_subdirectory(queryservice)
>  add_subdirectory(strigi)
>  add_subdirectory(removablestorage)
> +
> +add_subdirectory(activities)
> --- trunk/KDE/kdebase/workspace/libs/kworkspace/CMakeLists.txt
> #1122762:1122763 @@ -1,11 +1,38 @@
> 
> -
>  set(kworkspace_LIB_SRCS kdisplaymanager.cpp
>                          kwindowlistmenu.cpp
>                          screenpreviewwidget.cpp
>                          kworkspace.cpp
> +                        kactivityconsumer.cpp
> +                        kactivitycontroller.cpp
> +                        kactivitycontrollerdbus_p.cpp
> +                        kactivityinfo.cpp
>     )
> 
> +soprano_add_ontology(
> +   kworkspace_LIB_SRCS
> +   "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig"
> +   "nfo"
> +   "Ontologies"
> +   "trig"
> +   )
> +
> +soprano_add_ontology(
> +   kworkspace_LIB_SRCS
> +   "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig"
> +   "nco"
> +   "Ontologies"
> +   "trig"
> +   )
> +
> +soprano_add_ontology(
> +   kworkspace_LIB_SRCS
> +   "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig"
> +   "pimo"
> +   "Ontologies"
> +   "trig"
> +   )
> +
>  set(ksmserver_xml 
> ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
> qt4_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml}
> ksmserver_interface )
> 
> @@ -15,6 +42,26 @@
> 
>  qt4_add_dbus_interface( kworkspace_LIB_SRCS ${kwin_xml} kwin_interface )
> 
> +qt4_add_dbus_adaptor(
> +    kworkspace_LIB_SRCS
> +    org.kde.ActivityController.xml
> +    kactivitycontrollerdbus_p.h
> +    KActivityControllerDbus
> +)
> +
> +qt4_add_dbus_interface(
> +    kworkspace_LIB_SRCS
> +   
> ${KDEBASE_RUNTIME_SOURCE_DIR}/activitymanager/org.kde.ActivityManager.xml
> +    activitymanager_interface
> +)
> +
> +qt4_add_dbus_interface(
> +    kworkspace_LIB_SRCS
> +   
> ${KDEBASE_RUNTIME_SOURCE_DIR}/nepomuk/services/activities/org.kde.nepomuk.
> ActivitiesService.xml +    nepomukactivitiesservice_interface
> +)
> +
> +
>  if(WIN32)
>      set (LIB_MODE)
>  else(WIN32)
> @@ -31,4 +78,7 @@
>  install( FILES kdisplaymanager.h
>                 kwindowlistmenu.h
>                 kworkspace.h
> +               kactivityconsumer.h
> +               kactivitycontroller.h
> +               kactivityinfo.h
>           DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace COMPONENT Devel )