[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/farhad_hf/lockscreen] /: things are working now,
From:       Farhad Hedayati Fard <hf.farhad () gmail ! com>
Date:       2011-07-27 12:15:42
Message-ID: 20110727121542.D2B75A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 2003a94144e7aee9ccba12b39a6d4b185e911022 by Farhad Hedayati Fard.
Committed on 23/07/2011 at 14:25.
Pushed by hedayatifard into branch 'farhad_hf/lockscreen'.

things are working now, and build issues are almost solved. there is only one error \
left regarding to moc file generation.

M  +22   -0    kwin/CMakeLists.txt
M  +4    -2    krunner/CMakeLists.txt

http://commits.kde.org/kde-workspace/2003a94144e7aee9ccba12b39a6d4b185e911022

diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index 5244507..e47728d 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -9,8 +9,6 @@ include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/ksysguard
                     ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal
                     )
 
-set(screensaver_xml \
${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
                
-QT4_ADD_DBUS_INTERFACE(krunner_sessions_SRCS ${screensaver_xml} \
screensaver_interface)  
 
 set(krunner_KCFG_SRCS kcfg/krunnersettings.kcfgc kcfg/klaunchsettings.kcfgc)
@@ -43,6 +41,10 @@ set(krunner_SRCS
    ${default_interface_SRCS}
    ${quicksand_interface_SRCS})
 
+set(screensaver_xml \
${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
 +QT4_ADD_DBUS_INTERFACE(krunner_SRCS ${screensaver_xml} screensaver_interface)
+
+
 kde4_add_ui_files(krunner_SRCS interfaceOptions.ui)
 kde4_add_kcfg_files(krunner_SRCS ${krunner_KCFG_SRCS})
 
diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 9ecaaaa..002910f 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -106,6 +106,9 @@ endif( KWIN_HAVE_COMPOSITING )
 
 set(kwin_KDEINIT_SRCS
    screenlocker/screensaver/saverengine.cpp
+   screenlocker/screensaver/xautolock.cpp
+   screenlocker/screensaver/xautolock_diy.c
+   screenlocker/screensaver/xautolock_engine.c
    workspace.cpp 
    client.cpp 
    clientgroup.cpp
@@ -202,6 +205,7 @@ if(KWIN_BUILD_SCREENEDGES)
 endif(KWIN_BUILD_SCREENEDGES)
 
 
+
 qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace \
)  
 qt4_add_dbus_interface( kwin_KDEINIT_SRCS
@@ -209,12 +213,30 @@ qt4_add_dbus_interface( kwin_KDEINIT_SRCS
 
 qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
 
+SET_SOURCE_FILES_PROPERTIES(
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
+     PROPERTIES GENERATED 1
+)
+set (
+     kwin_KDEINIT_SRCS
+     ${kwin_KDEINIT_SRCS}
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaversettings.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/screensaveradaptor.cpp
+     ${CMAKE_CURRENT_BINARY_DIR}/screenlocker/kscreensaveradaptor.cpp
+)
+
 add_subdirectory( screenlocker )
 kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/kscreensaveradaptor.h \
${CMAKE_CURRENT_BINARY_DIR}/screensaveradaptor.h \
${CMAKE_CURRENT_BINARY_DIR}/kscreensaversettings.h PROPERTIES GENERATED 1)  \
add_dependencies(kwin generated_saver_dbus)  
+if(X11_Xss_LIB)
+  target_link_libraries(kdeinit_kwin ${X11_Xss_LIB})
+endif(X11_Xss_LIB)
+
 target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} kephal \
kworkspace kdecorations kwineffects ${X11_LIBRARIES})  
 if(KWIN_BUILD_SCRIPTING)


[prev in list] [next in list] [prev in thread] [next in thread]