From c16d2e1dffe237bd551ca1e133ccfd736e7c9d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sat, 21 Oct 2006 12:01:53 +0000 Subject: [PATCH] svn merge r595039 from trunk svn path=/branches/work/kwin_composite/; revision=597698 --- CMakeLists.txt | 67 +++++++++++++++++-- clients/b2/CMakeLists.txt | 37 ++++++++-- clients/b2/config/CMakeLists.txt | 22 ++++++ clients/default/CMakeLists.txt | 32 +++++++-- clients/default/config/CMakeLists.txt | 22 ++++++ clients/keramik/CMakeLists.txt | 25 +++++++ clients/keramik/config/CMakeLists.txt | 23 +++++++ clients/kwmtheme/CMakeLists.txt | 19 ++++++ clients/kwmtheme/cli_installer/CMakeLists.txt | 29 +++++++- clients/laptop/CMakeLists.txt | 30 +++++++-- clients/modernsystem/CMakeLists.txt | 32 +++++++-- clients/modernsystem/config/CMakeLists.txt | 24 +++++++ clients/plastik/CMakeLists.txt | 26 ++++++- clients/plastik/config/CMakeLists.txt | 25 +++++++ clients/quartz/CMakeLists.txt | 31 ++++++++- clients/quartz/config/CMakeLists.txt | 27 ++++++++ clients/redmond/CMakeLists.txt | 29 ++++++-- clients/web/CMakeLists.txt | 20 ++++++ data/CMakeLists.txt | 4 +- kcmkwin/kwindecoration/CMakeLists.txt | 26 ++++++- kcmkwin/kwinoptions/CMakeLists.txt | 31 +++++++-- kcmkwin/kwinrules/CMakeLists.txt | 40 ++++++++++- killer/CMakeLists.txt | 20 +++++- lib/CMakeLists.txt | 28 +++++++- tools/CMakeLists.txt | 20 ++++++ tools/decobenchmark/CMakeLists.txt | 18 +++++ 26 files changed, 668 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f91590be..ca52ee1473 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR} ########### next target ############### set(kwin_KDEINIT_SRCS - kwinadaptor.cpp + kwinadaptor.cpp workspace.cpp client.cpp placement.cpp @@ -38,7 +38,15 @@ set(kwin_KDEINIT_SRCS activation.cpp useractions.cpp geometry.cpp - rules.cpp ) + rules.cpp + composite.cpp + toplevel.cpp + unmanaged.cpp + scene.cpp + scene_basic.cpp + scene_xrender.cpp + scene_opengl.cpp + effects.cpp ) kde4_automoc(kwin ${kwin_KDEINIT_SRCS}) @@ -46,17 +54,68 @@ kde4_automoc(kwin ${kwin_KDEINIT_SRCS}) kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS}) target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} kdecorations ${X11_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} ) +target_link_libraries(kdeinit_kwin -lGL) +if (X11_Xcomposite_FOUND) + target_link_libraries(kdeinit_kwin ${X11_Xcomposite_LIB}) +endif (X11_Xcomposite_FOUND) +if (X11_Xdamage_FOUND) + target_link_libraries(kdeinit_kwin ${X11_Xdamage_LIB}) +endif (X11_Xdamage_FOUND) +if (X11_Xrender_FOUND) + target_link_libraries(kdeinit_kwin ${X11_Xrender_LIB}) +endif (X11_Xrender_FOUND) +if (X11_Xfixes_FOUND) + target_link_libraries(kdeinit_kwin ${X11_Xfixes_LIB}) +endif (X11_Xfixes_FOUND) install(TARGETS kdeinit_kwin DESTINATION ${LIB_INSTALL_DIR} ) target_link_libraries( kwin kdeinit_kwin ) -install(TARGETS kwin DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kwin DESTINATION bin) ########### install files ############### install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg ) + + +#original Makefile.am contents follow: + +#INCLUDES = -I$(srcdir)/lib $(all_includes) +# +#SUBDIRS = lib . killer kcmkwin pics clients oldheaders data +# +#bin_PROGRAMS = +#lib_LTLIBRARIES = +#kdeinit_LTLIBRARIES = kwin.la +# +#kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ +# utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ +# options.cpp plugins.cpp events.cpp KWinInterface.skel \ +# killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \ +# manage.cpp notifications.cpp activation.cpp useractions.cpp \ +# geometry.cpp rules.cpp +# +#kwin_la_LIBADD = $(LIB_KDEUI) lib/libkdecorations.la +#kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version +# +#include_HEADERS = KWinInterface.h +# +#KDE_ICON = kwin +# +#METASOURCES = AUTO +# +#messages: rc.cpp +# $(XGETTEXT) *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/kwin.pot +# +#kwin_datadir = $(kde_datadir)/kwin +# +#kwin_data_DATA= eventsrc +# +#kde_kcfg_DATA = kwin.kcfg +# +#include ../../admin/Doxyfile.am diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index ddb699dadb..9a4c21eab4 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -6,19 +6,48 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_b2_PART_SRCS b2client.cpp) +set(kwin3_b2_PART_SRCS b2client.cpp ) kde4_automoc(kwin3_b2 ${kwin3_b2_PART_SRCS}) kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS}) -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_b2) +kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_b2 ) -target_link_libraries(kwin3_b2 ${KDE4_KDEFX_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_b2 ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) -install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#SUBDIRS = . config +# +#kde_module_LTLIBRARIES = kwin3_b2.la +# +#kwin3_b2_la_SOURCES = b2client.cpp +#kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +## kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) +#kwin3_b2_la_LIBADD = ../../lib/libkdecorations.la -lkdefx +# +#METASOURCES = AUTO +#noinst_HEADERS = b2client.h +# +#lnkdir = $(kde_datadir)/kwin/ +#lnk_DATA = b2.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# +####KMAKE-start (don't edit or delete this block) +# +####KMAKE-end diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt index df228e8974..0be5cf4c5d 100644 --- a/clients/b2/config/CMakeLists.txt +++ b/clients/b2/config/CMakeLists.txt @@ -19,3 +19,25 @@ install(TARGETS kwin_b2_config DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_b2_config.la +# +#kwin_b2_config_la_SOURCES = config.cpp +#kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_b2_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h +# +#lnkdir = $(kde_datadir)/kwin/ +# +####KMAKE-start (don't edit or delete this block) +# +####KMAKE-end diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt index 2bf1d6e4fc..ae6b4f18ac 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -5,14 +5,38 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_default_PART_SRCS kdedefault.cpp) +set(kwin3_default_PART_SRCS kdedefault.cpp ) kde4_automoc(kwin3_default ${kwin3_default_PART_SRCS}) kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS}) -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_default) +kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_default ) -target_link_libraries(kwin3_default ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} kdefx kdecorations ${QT_QTGUI_LIBRARY}) -install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR} ) + + +########### install files ############### + + + + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#SUBDIRS = . config +# +#kde_module_LTLIBRARIES = kwin3_default.la +# +#kwin3_default_la_SOURCES = kdedefault.cpp +#kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_default_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la +# +#METASOURCES = AUTO +#noinst_HEADERS = kdedefault.h +# diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt index dac0090903..9a531392b1 100644 --- a/clients/default/config/CMakeLists.txt +++ b/clients/default/config/CMakeLists.txt @@ -19,3 +19,25 @@ install(TARGETS kwin_default_config DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_default_config.la +# +#kwin_default_config_la_SOURCES = config.cpp +#kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_default_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h +# +#lnkdir = $(kde_datadir)/kwin/ +# +####KMAKE-start (don't edit or delete this block) +# +####KMAKE-end diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt index 5827785f05..d6c164105c 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -25,3 +25,28 @@ install(TARGETS kwin3_keramik DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + + +#original Makefile.am contents follow: + +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#SUBDIRS = . config +# +#kde_module_LTLIBRARIES = kwin3_keramik.la +# +#kwin3_keramik_la_SOURCES = keramik.cpp tiles.qrc +#kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_keramik_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la +##kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) +# +#METASOURCES = AUTO +#noinst_headers = keramik.h +# +#lnkdir = $(kde_datadir)/kwin +#lnk_DATA = keramik.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# +# diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt index 4fcb69795b..e417c2dd74 100644 --- a/clients/keramik/config/CMakeLists.txt +++ b/clients/keramik/config/CMakeLists.txt @@ -17,3 +17,26 @@ target_link_libraries(kwin_keramik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY install(TARGETS kwin_keramik_config DESTINATION ${PLUGIN_INSTALL_DIR} ) + +########### install files ############### + +install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_keramik_config.la +# +#kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui +#kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_keramik_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h keramikconfig.h +# +#lnkdir = $(kde_datadir)/kwin +# diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt index 2cf8d1b972..d098882d2f 100644 --- a/clients/kwmtheme/CMakeLists.txt +++ b/clients/kwmtheme/CMakeLists.txt @@ -24,3 +24,22 @@ install(TARGETS kwin3_kwmtheme DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES kwmtheme.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + +#original Makefile.am contents follow: + +#SUBDIRS=cli_installer +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin3_kwmtheme.la +# +#kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp +#kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_kwmtheme_la_LIBADD = -lkdecorations +# +#METASOURCES = AUTO +#noinst_HEADERS = kwmthemeclient.h +# +#lnkdir = $(kde_datadir)/kwin +#lnk_DATA = kwmtheme.desktop +# diff --git a/clients/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt index 9e6301f468..08988608bd 100644 --- a/clients/kwmtheme/cli_installer/CMakeLists.txt +++ b/clients/kwmtheme/cli_installer/CMakeLists.txt @@ -11,5 +11,32 @@ kde4_add_executable(kwmtheme ${kwmtheme_SRCS}) target_link_libraries(kwmtheme ${KDE4_KDECORE_LIBS} ) -install(TARGETS kwmtheme DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kwmtheme DESTINATION bin) + +########### install files ############### + + + + + +#original Makefile.am contents follow: + +# +## set the include path for X, qt and KDE +#INCLUDES= $(all_includes) +# +######## This part is very kwmtheme specific +## you can add here more. This one gets installed +#bin_PROGRAMS = kwmtheme +# +## Which sources should be compiled for kwmtheme. +#kwmtheme_SOURCES = main.cpp +# +## the library search path. +#kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) +# +## the libraries to link against. Be aware of the order. First the libraries, +## that depend on the following ones. +#kwmtheme_LDADD = $(LIB_KDECORE) +# diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index 395c57a25a..83dbf6c8b8 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -4,20 +4,42 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_laptop_PART_SRCS laptopclient.cpp) +set(kwin3_laptop_PART_SRCS laptopclient.cpp ) kde4_automoc(kwin3_laptop ${kwin3_laptop_PART_SRCS}) kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS}) -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_laptop) +kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_laptop ) -target_link_libraries(kwin3_laptop ${KDE4_KDEFX_LIBS} kdecorations) +target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} kdecorations kdefx ) -install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#kde_module_LTLIBRARIES = kwin3_laptop.la +# +#kwin3_laptop_la_SOURCES = laptopclient.cpp +#kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_laptop_la_LIBADD = ../../lib/libkdecorations.la -lkdefx +# +#METASOURCES = AUTO +#noinst_HEADERS = laptopclient.h +# +#lnkdir = $(kde_datadir)/kwin +#lnk_DATA = laptop.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index 141433abd4..5ab1f421cd 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -6,20 +6,44 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_modernsys_PART_SRCS modernsys.cpp) +set(kwin3_modernsys_PART_SRCS modernsys.cpp ) kde4_automoc(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_modernsys) +kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_modernsys ) -target_link_libraries(kwin3_modernsys ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_modernsys ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QTGUI_LIBRARY}) -install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#SUBDIRS = config +# +#kde_module_LTLIBRARIES = kwin3_modernsys.la +# +#kwin3_modernsys_la_SOURCES = modernsys.cpp +#kwin3_modernsys_la_LIBADD = ../../lib/libkdecorations.la -lkdefx +#kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +# +#METASOURCES = AUTO +#noinst_HEADERS = modernsys.h +# +#lnkdir = $(kde_datadir)/kwin/ +#lnk_DATA = modernsystem.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt index 37560f887b..a75d9330e1 100644 --- a/clients/modernsystem/config/CMakeLists.txt +++ b/clients/modernsystem/config/CMakeLists.txt @@ -15,3 +15,27 @@ target_link_libraries(kwin_modernsys_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRA install(TARGETS kwin_modernsys_config DESTINATION ${PLUGIN_INSTALL_DIR} ) + +########### install files ############### + +install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +# +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_modernsys_config.la +# +#kwin_modernsys_config_la_SOURCES = config.cpp +#kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h +# +#lnkdir = $(kde_datadir)/kwin/ +# diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt index c6d91499ed..ef0a9357d8 100644 --- a/clients/plastik/CMakeLists.txt +++ b/clients/plastik/CMakeLists.txt @@ -18,7 +18,7 @@ kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_plastik ) -target_link_libraries(kwin3_plastik kdecorations ${KDE4_KDEFX_LIBS}) +target_link_libraries(kwin3_plastik ${KDE4_KDEUI_LIBS} kdecorations kdefx) install(TARGETS kwin3_plastik DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -27,3 +27,27 @@ install(TARGETS kwin3_plastik DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + +#original Makefile.am contents follow: + +#AUTOMAKE_OPTIONS = foreign +# +#SUBDIRS = config +# +#KDE_CXXFLAGS = -DQT_PLUGIN +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#kwindir = $(kde_datadir)/kwin/ +#kwin_DATA = plastik.desktop +# +#kde_module_LTLIBRARIES = kwin3_plastik.la +#kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp +#kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_plastik_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la +#kwin3_plastik_la_METASOURCES = AUTO +# +#DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES) +# diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt index f52560893f..a2981056f4 100644 --- a/clients/plastik/config/CMakeLists.txt +++ b/clients/plastik/config/CMakeLists.txt @@ -16,3 +16,28 @@ 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 kwin_plastik_config DESTINATION ${PLUGIN_INSTALL_DIR} ) + + +########### install files ############### + +install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_plastik_config.la +# +#kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui +#kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_plastik_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h +#DISTCLEANFILES = $(METASOURCES) +# +#lnkdir = $(kde_datadir)/kwin +# diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt index b7f1649166..3ff1360848 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_quartz ) -target_link_libraries(kwin3_quartz kdecorations ${KDE4_KDEFX_LIBS}) +target_link_libraries(kwin3_quartz ${KDE4_KDEUI_LIBS} kdecorations kdefx) install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -22,3 +22,32 @@ install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#SUBDIRS = . config +# +#kde_module_LTLIBRARIES = kwin3_quartz.la +# +#kwin3_quartz_la_SOURCES = quartz.cpp +#kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_quartz_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la +# +#METASOURCES = AUTO +#noinst_HEADERS = quartz.h +# +#lnkdir = $(kde_datadir)/kwin/ +#lnk_DATA = quartz.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# +# +####KMAKE-start (don't edit or delete this block) +# +####KMAKE-end diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt index 053df75d63..8eded25262 100644 --- a/clients/quartz/config/CMakeLists.txt +++ b/clients/quartz/config/CMakeLists.txt @@ -14,3 +14,30 @@ kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin_quartz_config ) target_link_libraries(kwin_quartz_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}) install(TARGETS kwin_quartz_config DESTINATION ${PLUGIN_INSTALL_DIR} ) + + +########### install files ############### + +install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kwin_quartz_config.la +# +#kwin_quartz_config_la_SOURCES = config.cpp +#kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin_quartz_config_la_LIBADD = $(LIB_KDEUI) +# +#METASOURCES = AUTO +#noinst_HEADERS = config.h +# +#lnkdir = $(kde_datadir)/kwin/ +# +####KMAKE-start (don't edit or delete this block) +# +####KMAKE-end diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index 5cb3803eb7..cd927dab72 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -5,17 +5,17 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_redmond_PART_SRCS redmond.cpp) +set(kwin3_redmond_PART_SRCS redmond.cpp ) kde4_automoc(kwin3_redmond ${kwin3_redmond_PART_SRCS}) kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kwin3_redmond) +kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_redmond ) -target_link_libraries(kwin3_redmond ${KDE4_KDEFX_LIBS} kdecorations) +target_link_libraries(kwin3_redmond ${KDE4_KDECORE_LIBS} kdefx kdecorations ) -install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### @@ -23,3 +23,24 @@ install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) + + +#original Makefile.am contents follow: + +# +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#kde_module_LTLIBRARIES = kwin3_redmond.la +# +#kwin3_redmond_la_SOURCES = redmond.cpp +#kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_redmond_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la +# +#METASOURCES = AUTO +#noinst_HEADERS = redmond.h +# +#lnkdir = $(kde_datadir)/kwin +#lnk_DATA = redmond.desktop +# +#EXTRA_DIST = $(lnk_DATA) +# diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt index 9cb8df6f80..7c5c639a7d 100644 --- a/clients/web/CMakeLists.txt +++ b/clients/web/CMakeLists.txt @@ -21,3 +21,23 @@ install(TARGETS kwin3_web DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) + + + +#original Makefile.am contents follow: + +#INCLUDES = -I$(top_srcdir) $(all_includes) +#kde_module_LTLIBRARIES = kwin3_web.la +# +#kwin3_web_la_SOURCES = Web.cpp WebButton.cpp +# +#noinst_HEADERS = Web.h WebButton.h +# +#kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +#kwin3_web_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la +#METASOURCES = AUTO +# +#linkdir = $(kde_datadir)/kwin/ +#link_DATA = web.desktop +#EXTRA_DIST = $(link_DATA) +# diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 847e3a93d8..85132998fa 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -10,7 +10,7 @@ kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_S target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} ) -install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ ) +install_targets(/lib/kconf_update_bin/ kwin_update_window_settings ) @@ -23,7 +23,7 @@ kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS} target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} ) -install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ ) +install_targets(/lib/kconf_update_bin/ kwin_update_default_rules ) ########### install files ############### diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 0c147a58fd..e967c0e8b6 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) +set(kcm_kwindecoration_PART_SRCS kwindecorationadaptor.cpp kwindecoration.cpp buttons.cpp preview.cpp ) kde4_automoc(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) @@ -19,6 +19,28 @@ install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kwindecoration.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kwindecoration.desktop DESTINATION ${XDG_APPS_DIR} ) + + +#original Makefile.am contents follow: + +#INCLUDES = -I$(srcdir)/../../lib $(all_includes) +# +#kde_module_LTLIBRARIES = kcm_kwindecoration.la +# +#kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp +#noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h +# +#kcm_kwindecoration_la_LDFLAGS = \ +# -module -avoid-version $(all_libraries) -no-undefined +# +#kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la +# +#METASOURCES = AUTO +# +#messages: +# $(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot +# +#xdg_apps_DATA = kwindecoration.desktop diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index d7c0af0d2a..0108270642 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -18,9 +18,32 @@ install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES kwinoptions.desktop kwinactions.desktop kwinadvanced.desktop - kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop - DESTINATION ${SERVICES_INSTALL_DIR}) +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} ) +kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg ) + + + +#original Makefile.am contents follow: + +#METASOURCES = AUTO +#INCLUDES = $(all_includes) +# +#kde_module_LTLIBRARIES = kcm_kwinoptions.la +# +#kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp +#kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +#kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI) +# +#noinst_HEADERS = windows.h mouse.h +# +#messages: +# $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot +# +#kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop +#kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden +# +#xdg_apps_DATA = kwinoptions.desktop +#KDE_ICON=AUTO diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index f73eeb7a1d..d137c73678 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ) 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_INSTALL_DIR}) +install(TARGETS kwin_rules_dialog DESTINATION bin) ########### next target ############### @@ -34,8 +34,44 @@ target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ) install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} ) +########### next target ############### + + ########### install files ############### -install( FILES kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kwinrules.desktop DESTINATION ${XDG_APPS_DIR} ) + + +#original Makefile.am contents follow: + +#METASOURCES = AUTO +#AM_CPPFLAGS = $(all_includes) -DKCMRULES +#INCLUDES = -I$(top_srcdir)/workspace/kwin/lib +# +#bin_PROGRAMS = +#lib_LTLIBRARIES = +#kdeinit_LTLIBRARIES = kwin_rules_dialog.la +#kde_module_LTLIBRARIES = kcm_kwinrules.la +#noinst_LTLIBRARIES = libkwinrules.la +# +#libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \ +# ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui +#libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined +#libkwinrules_la_LIBADD = $(LIB_KDEUI) +# +#kcm_kwinrules_la_SOURCES = kcm.cpp +#kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +#kcm_kwinrules_la_LIBADD = libkwinrules.la +#kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h +# +#kwin_rules_dialog_la_SOURCES = main.cpp +#kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +#kwin_rules_dialog_la_LIBADD = libkwinrules.la +#kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h +# +#messages: rc.cpp +# $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot +# +#xdg_apps_DATA = kwinrules.desktop diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 92d0f184bc..76ff68669c 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -11,5 +11,23 @@ kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS}) target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} ) -install(TARGETS kwin_killer_helper DESTINATION ${BIN_INSTALL_DIR}) +install(TARGETS kwin_killer_helper DESTINATION bin) + +########### install files ############### + + + + + +#original Makefile.am contents follow: + +#INCLUDES = $(all_includes) +# +#bin_PROGRAMS = kwin_killer_helper +# +#kwin_killer_helper_SOURCES = killer.cpp +#kwin_killer_helper_LDADD = $(LIB_KDEUI) +#kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) +# +#METASOURCES = AUTO diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4f3a10daed..661f0bf09a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -22,4 +22,30 @@ install(TARGETS kdecorations DESTINATION ${LIB_INSTALL_DIR} ) ########### install files ############### -install( FILES kdecoration.h kdecoration_p.h kdecoration_plugins_p.h kdecorationfactory.h kcommondecoration.h DESTINATION ${INCLUDE_INSTALL_DIR}) +install_files( /include FILES kdecoration.h kdecoration_p.h kdecoration_plugins_p.h kdecorationfactory.h kcommondecoration.h ) + + + + +#original Makefile.am contents follow: + +## FRAME libkwin??? +#lib_LTLIBRARIES = libkdecorations.la +# +#libkdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ +# kdecorationfactory.cpp kcommondecoration.cpp +#libkdecorations_la_LIBADD = $(LIB_KDECORE) +#libkdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined +# +## FRAME +#include_HEADERS = kdecoration.h kdecoration_p.h kdecoration_plugins_p.h \ +# kdecorationfactory.h kcommondecoration.h +# +#INCLUDES = $(all_includes) +#METASOURCES = AUTO +# +#include ../../../admin/Doxyfile.am +# +#messages: rc.cpp +# $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_lib.pot +# -rm rc.cpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index eca2d34fa0..202f823de8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -13,3 +13,23 @@ kde4_add_executable(test_gravity ${test_gravity_SRCS}) target_link_libraries(test_gravity ${KDE4_KDECORE_LIBS} ) + +########### install files ############### + + + + + +#original Makefile.am contents follow: + +#noinst_PROGRAMS = test_gravity +# +#SUBDIRS = decobenchmark +# +#INCLUDES = $(all_includes) +# +#test_gravity_SOURCES = test_gravity.cpp +#test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) +#test_gravity_LDADD = $(LIB_X11) +# +#METASOURCES = AUTO diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt index 9cf5ede5a3..c5c57d7de5 100644 --- a/tools/decobenchmark/CMakeLists.txt +++ b/tools/decobenchmark/CMakeLists.txt @@ -11,3 +11,21 @@ kde4_add_executable(decobenchmark ${decobenchmark_SRCS}) target_link_libraries(decobenchmark ${KDE4_KDECORE_LIBS} kdecorations ) + +########### install files ############### + + + + + +#original Makefile.am contents follow: + +#noinst_PROGRAMS = decobenchmark +# +#INCLUDES = $(all_includes) +# +#decobenchmark_SOURCES = main.cpp preview.cpp +#decobenchmark_LDFLAGS = $(all_libraries) +#decobenchmark_LDADD = ../../lib/libkdecorations.la +# +#METASOURCES = AUTO