diff --git a/CMakeLists.txt b/CMakeLists.txt index c07e1cee15..85f91590be 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,84 +38,25 @@ set(kwin_KDEINIT_SRCS activation.cpp useractions.cpp geometry.cpp - rules.cpp - composite.cpp - toplevel.cpp - unmanaged.cpp - scene.cpp - scene_basic.cpp - scene_xrender.cpp - scene_opengl.cpp - effects.cpp ) + rules.cpp ) -kde4_automoc(${kwin_KDEINIT_SRCS}) +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(TARGETS kwin DESTINATION ${BIN_INSTALL_DIR}) ########### install files ############### install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) -kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg ) +kde4_install_icons( ${ICON_INSTALL_DIR} ) - - -#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 e4163fd13a..ddb699dadb 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_b2_PART_SRCS b2client.cpp) -kde4_automoc(${kwin3_b2_PART_SRCS}) +kde4_automoc(kwin3_b2 ${kwin3_b2_PART_SRCS}) kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS}) diff --git a/clients/b2/config/CMakeLists.txt b/clients/b2/config/CMakeLists.txt index b1ff97a996..df228e8974 100644 --- a/clients/b2/config/CMakeLists.txt +++ b/clients/b2/config/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin_b2_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_b2_config_PART_SRCS}) +kde4_automoc(kwin_b2_config ${kwin_b2_config_PART_SRCS}) kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS}) diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt index 6294b8286c..2bf1d6e4fc 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_default_PART_SRCS kdedefault.cpp) -kde4_automoc(${kwin3_default_PART_SRCS}) +kde4_automoc(kwin3_default ${kwin3_default_PART_SRCS}) kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS}) diff --git a/clients/default/config/CMakeLists.txt b/clients/default/config/CMakeLists.txt index cd00d36d65..dac0090903 100644 --- a/clients/default/config/CMakeLists.txt +++ b/clients/default/config/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwin_default_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_default_config_PART_SRCS}) +kde4_automoc(kwin_default_config ${kwin_default_config_PART_SRCS}) kde4_add_plugin(kwin_default_config ${kwin_default_config_PART_SRCS}) diff --git a/clients/keramik/CMakeLists.txt b/clients/keramik/CMakeLists.txt index 917285a5ee..5827785f05 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_keramik_PART_SRCS keramik.cpp ) -kde4_automoc(${kwin3_keramik_PART_SRCS}) +kde4_automoc(kwin3_keramik ${kwin3_keramik_PART_SRCS}) qt4_add_resources(kwin3_keramik_PART_SRCS tiles.qrc ) diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt index c406a27268..4fcb69795b 100644 --- a/clients/keramik/config/CMakeLists.txt +++ b/clients/keramik/config/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin_keramik_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_keramik_config_PART_SRCS}) +kde4_automoc(kwin_keramik_config ${kwin_keramik_config_PART_SRCS}) kde4_add_ui3_files(kwin_keramik_config_PART_SRCS keramikconfig.ui ) diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt index 6b01975b0d..2cf8d1b972 100644 --- a/clients/kwmtheme/CMakeLists.txt +++ b/clients/kwmtheme/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory( cli_installer ) set(kwin3_kwmtheme_PART_SRCS kwmthemeclient.cpp ) -kde4_automoc(${kwin3_kwmtheme_PART_SRCS}) +kde4_automoc(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS}) kde4_add_plugin(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS}) diff --git a/clients/kwmtheme/cli_installer/CMakeLists.txt b/clients/kwmtheme/cli_installer/CMakeLists.txt index 3ce35ba12e..9e6301f468 100644 --- a/clients/kwmtheme/cli_installer/CMakeLists.txt +++ b/clients/kwmtheme/cli_installer/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwmtheme_SRCS main.cpp ) -kde4_automoc(${kwmtheme_SRCS}) +kde4_automoc(kwmtheme ${kwmtheme_SRCS}) kde4_add_executable(kwmtheme ${kwmtheme_SRCS}) diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index d1e163f5b5..395c57a25a 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_laptop_PART_SRCS laptopclient.cpp) -kde4_automoc(${kwin3_laptop_PART_SRCS}) +kde4_automoc(kwin3_laptop ${kwin3_laptop_PART_SRCS}) kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS}) diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index b295467594..141433abd4 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_modernsys_PART_SRCS modernsys.cpp) -kde4_automoc(${kwin3_modernsys_PART_SRCS}) +kde4_automoc(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) diff --git a/clients/modernsystem/config/CMakeLists.txt b/clients/modernsystem/config/CMakeLists.txt index 882b304c18..37560f887b 100644 --- a/clients/modernsystem/config/CMakeLists.txt +++ b/clients/modernsystem/config/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwin_modernsys_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_modernsys_config_PART_SRCS}) +kde4_automoc(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS}) kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS}) diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt index bc1fdbe881..c6d91499ed 100644 --- a/clients/plastik/CMakeLists.txt +++ b/clients/plastik/CMakeLists.txt @@ -12,7 +12,7 @@ set(kwin3_plastik_PART_SRCS plastikbutton.cpp misc.cpp ) -kde4_automoc(${kwin3_plastik_PART_SRCS}) +kde4_automoc(kwin3_plastik ${kwin3_plastik_PART_SRCS}) kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS}) diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt index 6f3e0afc9f..f52560893f 100644 --- a/clients/plastik/config/CMakeLists.txt +++ b/clients/plastik/config/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwin_plastik_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_plastik_config_PART_SRCS}) +kde4_automoc(kwin_plastik_config ${kwin_plastik_config_PART_SRCS}) kde4_add_ui3_files(kwin_plastik_config_PART_SRCS configdialog.ui ) diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt index fa6fe08253..b7f1649166 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory( config ) set(kwin3_quartz_PART_SRCS quartz.cpp ) -kde4_automoc(${kwin3_quartz_PART_SRCS}) +kde4_automoc(kwin3_quartz ${kwin3_quartz_PART_SRCS}) kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS}) diff --git a/clients/quartz/config/CMakeLists.txt b/clients/quartz/config/CMakeLists.txt index facd0367ba..053df75d63 100644 --- a/clients/quartz/config/CMakeLists.txt +++ b/clients/quartz/config/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwin_quartz_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_quartz_config_PART_SRCS}) +kde4_automoc(kwin_quartz_config ${kwin_quartz_config_PART_SRCS}) kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS}) diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index 769434fa87..5cb3803eb7 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kwin3_redmond_PART_SRCS redmond.cpp) -kde4_automoc(${kwin3_redmond_PART_SRCS}) +kde4_automoc(kwin3_redmond ${kwin3_redmond_PART_SRCS}) kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) diff --git a/clients/test/CMakeLists.txt b/clients/test/CMakeLists.txt index f6d289d94d..de6bff885e 100644 --- a/clients/test/CMakeLists.txt +++ b/clients/test/CMakeLists.txt @@ -6,7 +6,7 @@ set(kwin3_test_PART_SRCS test.cpp ) -kde4_automoc(${kwin3_test_PART_SRCS}) +kde4_automoc(kwin3_test ${kwin3_test_PART_SRCS}) kde4_add_plugin(kwin3_test ${kwin3_test_PART_SRCS}) diff --git a/clients/web/CMakeLists.txt b/clients/web/CMakeLists.txt index f90c8f52d6..9cb8df6f80 100644 --- a/clients/web/CMakeLists.txt +++ b/clients/web/CMakeLists.txt @@ -6,7 +6,7 @@ set(kwin3_web_PART_SRCS Web.cpp WebButton.cpp ) -kde4_automoc(${kwin3_web_PART_SRCS}) +kde4_automoc(kwin3_web ${kwin3_web_PART_SRCS}) kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS}) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6ee13b4df0..847e3a93d8 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,7 +4,7 @@ ########### next target ############### set(kwin_update_window_settings_SRCS update_window_settings.cpp) -kde4_automoc(${kwin_update_window_settings_SRCS}) +kde4_automoc(kwin_update_window_settings ${kwin_update_window_settings_SRCS}) kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS}) @@ -17,7 +17,7 @@ install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf ########### next target ############### set(kwin_update_default_rules_SRCS update_default_rules.cpp) -kde4_automoc(${kwin_update_default_rules}) +kde4_automoc(kwin_update_default_rules ${kwin_update_default_rules}) kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS}) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 622484c96f..0c147a58fd 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) -kde4_automoc(${kcm_kwindecoration_PART_SRCS}) +kde4_automoc(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index eb57ff9c32..d7c0af0d2a 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -5,7 +5,7 @@ set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp ) -kde4_automoc(${kcm_kwinoptions_PART_SRCS}) +kde4_automoc(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS}) kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS}) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index f889773804..f73eeb7a1d 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -8,7 +8,7 @@ kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui ruleslistbase.ui detectwidg set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS}) -kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS}) +kde4_automoc(kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}) kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}) @@ -23,7 +23,7 @@ install(TARGETS kwin_rules_dialog DESTINATION ${BIN_INSTALL_DIR}) set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS}) -kde4_automoc(${kcm_kwinrules_PART_SRCS}) +kde4_automoc(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 6afba0b114..92d0f184bc 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwin_killer_helper_SRCS killer.cpp ) -kde4_automoc(${kwin_killer_helper_SRCS}) +kde4_automoc(kwin_killer_helper ${kwin_killer_helper_SRCS}) kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 865842799f..4f3a10daed 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -10,7 +10,7 @@ set(kdecorations_LIB_SRCS kdecorationfactory.cpp kcommondecoration.cpp ) -kde4_automoc(${kdecorations_LIB_SRCS}) +kde4_automoc(kdecorations ${kdecorations_LIB_SRCS}) kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS}) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4157ec181d..eca2d34fa0 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory( decobenchmark ) set(test_gravity_SRCS test_gravity.cpp ) -kde4_automoc(${test_gravity_SRCS}) +kde4_automoc(test_gravity ${test_gravity_SRCS}) kde4_add_executable(test_gravity ${test_gravity_SRCS}) diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt index 03c0aa33bb..9cf5ede5a3 100644 --- a/tools/decobenchmark/CMakeLists.txt +++ b/tools/decobenchmark/CMakeLists.txt @@ -5,7 +5,7 @@ set(decobenchmark_SRCS main.cpp preview.cpp ) -kde4_automoc(${decobenchmark_SRCS}) +kde4_automoc(decobenchmark ${decobenchmark_SRCS}) kde4_add_executable(decobenchmark ${decobenchmark_SRCS})