merge bleeding edge. bleeding edge is now again dead

svn path=/trunk/KDE/kdebase/workspace/; revision=558082

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
This commit is contained in:
Dirk Mueller 2006-07-04 17:09:53 +00:00
parent cc38fbe9cf
commit e12b8f755a
24 changed files with 50 additions and 50 deletions

View file

@ -52,15 +52,15 @@ kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} kdecorations ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
install_targets(${LIB_INSTALL_DIR} kdeinit_kwin )
install(TARGETS kdeinit_kwin DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( kwin kdeinit_kwin )
install(TARGETS kwin DESTINATION bin)
########### install files ###############
install_files( ${KCFG_INSTALL_DIR} FILES kwin.kcfg )
install_files( ${DATA_INSTALL_DIR}/kwin FILES eventsrc )
install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin )
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )

View file

@ -16,12 +16,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_b2 )
target_link_libraries(kwin3_b2 ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin3_b2 )
install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES b2.desktop )
install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_b2_config )
target_link_libraries(kwin_b2_config ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_b2_config )
install(TARGETS kwin_b2_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -15,7 +15,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_default )
target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} kdefx kdecorations ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin3_default )
install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############

View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_default_config )
target_link_libraries(kwin_default_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_default_config )
install(TARGETS kwin_default_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -18,12 +18,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_keramik )
target_link_libraries(kwin3_keramik ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin3_keramik )
install(TARGETS kwin3_keramik DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES keramik.desktop )
install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -15,12 +15,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_keramik_config )
target_link_libraries(kwin_keramik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_keramik_config )
install(TARGETS kwin_keramik_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -16,12 +16,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_kwmtheme )
target_link_libraries(kwin3_kwmtheme ${KDE4_KDECORE_LIBS} kdecorations )
install_targets(${PLUGIN_INSTALL_DIR} kwin3_kwmtheme )
install(TARGETS kwin3_kwmtheme DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES kwmtheme.desktop )
install( FILES kwmtheme.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -14,12 +14,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_laptop )
target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} kdecorations kdefx )
install_targets(${PLUGIN_INSTALL_DIR} kwin3_laptop )
install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES laptop.desktop )
install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -16,12 +16,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_modernsys )
target_link_libraries(kwin3_modernsys ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin3_modernsys )
install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES modernsystem.desktop )
install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_modernsys_config )
target_link_libraries(kwin_modernsys_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_modernsys_config )
install(TARGETS kwin_modernsys_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -20,12 +20,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_plastik )
target_link_libraries(kwin3_plastik ${KDE4_KDEUI_LIBS} kdecorations kdefx)
install_targets(${PLUGIN_INSTALL_DIR} kwin3_plastik )
install(TARGETS kwin3_plastik DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES plastik.desktop )
install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -15,12 +15,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_plastik_config )
target_link_libraries(kwin_plastik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_plastik_config )
install(TARGETS kwin_plastik_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -16,12 +16,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_quartz )
target_link_libraries(kwin3_quartz ${KDE4_KDEUI_LIBS} kdecorations kdefx)
install_targets(${PLUGIN_INSTALL_DIR} kwin3_quartz )
install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES quartz.desktop )
install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -13,12 +13,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_quartz_config )
target_link_libraries(kwin_quartz_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kwin_quartz_config )
install(TARGETS kwin_quartz_config DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES )
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -15,12 +15,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_redmond )
target_link_libraries(kwin3_redmond ${KDE4_KDECORE_LIBS} kdefx kdecorations )
install_targets(${PLUGIN_INSTALL_DIR} kwin3_redmond )
install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES redmond.desktop )
install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -14,12 +14,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_test )
target_link_libraries(kwin3_test ${KDE4_KDEUI_LIBS} kdecorations )
install_targets(${PLUGIN_INSTALL_DIR} kwin3_test )
install(TARGETS kwin3_test DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin FILES test.desktop )
install( FILES test.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )

View file

@ -14,12 +14,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_web )
target_link_libraries(kwin3_web ${KDE4_KDEUI_LIBS} kdecorations )
install_targets(${PLUGIN_INSTALL_DIR} kwin3_web )
install(TARGETS kwin3_web DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/ FILES web.desktop )
install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )

View file

@ -28,10 +28,10 @@ install_targets(/lib/kconf_update_bin/ kwin_update_default_rules )
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/default_rules FILES fsp_workarounds_1 )
install_files( ${SOUND_INSTALL_DIR} FILES pop.wav )
install_files( ${KCONF_UPDATE_INSTALL_DIR} FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd )
install_programs( ${KCONF_UPDATE_INSTALL_DIR} FILES pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh )
install( FILES fsp_workarounds_1 DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install(PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

View file

@ -14,12 +14,12 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwindecoration )
target_link_libraries(kcm_kwindecoration ${KDE4_KDEUI_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES})
install_targets(${PLUGIN_INSTALL_DIR} kcm_kwindecoration )
install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kwindecoration.desktop )
install( FILES kwindecoration.desktop DESTINATION ${XDG_APPS_DIR} )

View file

@ -13,13 +13,13 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
install_targets(${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kwinoptions.desktop )
install_files( ${APPLNK_INSTALL_DIR}/.hidden FILES kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop )
install( FILES kwinoptions.desktop DESTINATION ${XDG_APPS_DIR} )
install( FILES kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )

View file

@ -14,7 +14,7 @@ kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}
target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} )
install_targets(${LIB_INSTALL_DIR} kdeinit_kwin_rules_dialog )
install(TARGETS kdeinit_kwin_rules_dialog DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( kwin_rules_dialog kdeinit_kwin_rules_dialog )
install(TARGETS kwin_rules_dialog DESTINATION bin)
@ -31,7 +31,7 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinrules )
target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} )
install_targets(${PLUGIN_INSTALL_DIR} kcm_kwinrules )
install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} )
########### next target ###############
@ -39,7 +39,7 @@ install_targets(${PLUGIN_INSTALL_DIR} kcm_kwinrules )
########### install files ###############
install_files( ${XDG_APPS_DIR} FILES kwinrules.desktop )
install( FILES kwinrules.desktop DESTINATION ${XDG_APPS_DIR} )

View file

@ -17,7 +17,7 @@ kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
target_link_libraries(kdecorations ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
set_target_properties(kdecorations PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install_targets(${LIB_INSTALL_DIR} kdecorations )
install(TARGETS kdecorations DESTINATION ${LIB_INSTALL_DIR} )
########### install files ###############

View file

@ -3,7 +3,7 @@
########### install files ###############
install_files( ${DATA_INSTALL_DIR}/kwin/pics FILES close.png maximize.png maximizedown.png menu.png iconify.png pindown.png pinup.png unknown.png fog.png fog-grey.png bluesun.png greenie.light.png greenie.dim.png )
install( FILES close.png maximize.png maximizedown.png menu.png iconify.png pindown.png pinup.png unknown.png fog.png fog-grey.png bluesun.png greenie.light.png greenie.dim.png DESTINATION ${DATA_INSTALL_DIR}/kwin/pics )