From kde-commits Mon Oct 25 07:42:23 2010 From: Oswald Buddenhagen Date: Mon, 25 Oct 2010 07:42:23 +0000 To: kde-commits Subject: KDE/kdebase/workspace Message-Id: <20101025074223.C44D3AC89A () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128799259617382 SVN commit 1189442 by ossi: decruft build files M +4 -5 kcontrol/kdm/CMakeLists.txt M +0 -11 kcontrol/kdm/background/CMakeLists.txt M +1 -1 kdm/CMakeLists.txt --- trunk/KDE/kdebase/workspace/kcontrol/kdm/CMakeLists.txt #1189441:1189442 @@ -1,13 +1,12 @@ add_subdirectory( background ) -# Currently needed for DEFAULT_TEXT_HEIGHT -# The plan is to move konq_iconviewwidget to kdesktop and then it's all inside workspace. -# But first KonqOperations must be redesigned to not use konq_iconviewwidget... include_directories( ${QIMAGEBLITZ_INCLUDES} ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/background/ ) -kde4_add_ui_files(kcmbackgroundlib_SRCS ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background/bgwallpaper_ui.ui ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background/bgdialog_ui.ui ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background/bgadvanced_ui.ui) +kde4_add_ui_files(kcmbackgroundlib_SRCS + background/bgwallpaper_ui.ui + background/bgdialog_ui.ui + background/bgadvanced_ui.ui) set(kcm_kdm_PART_SRCS ${kcmbackgroundlib_SRCS} ${backgroundlib_SRCS} background.cpp --- trunk/KDE/kdebase/workspace/kcontrol/kdm/background/CMakeLists.txt #1189441:1189442 @@ -3,16 +3,5 @@ add_subdirectory( patterns ) add_subdirectory( programs ) -include_directories( ${QIMAGEBLITZ_INCLUDES} ) - -########### next target ############### -kde4_add_ui_files(kcmbackgroundlib_SRCS - bgdialog_ui.ui - bgwallpaper_ui.ui - bgadvanced_ui.ui -) - install( FILES background.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) -#kde4_install_icons( ${ICON_INSTALL_DIR} ) - --- trunk/KDE/kdebase/workspace/kdm/CMakeLists.txt #1189441:1189442 @@ -28,6 +28,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/TODO devel-home:files/kdm) -# after build_confci is defined +# after confci is defined add_subdirectory(backend) add_subdirectory(kfrontend)