diff --git a/CMakeLists.txt b/CMakeLists.txt index 544860af65..7e2130ddc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ set(kwin_KDEINIT_SRCS qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace ) -kde4_automoc(${kwin_KDEINIT_SRCS}) kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS}) diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index 698bf4d617..4ec2698ce8 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory( config ) set(kwin3_b2_PART_SRCS b2client.cpp) -kde4_automoc(${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 2180dfed95..ec6e437948 100644 --- a/clients/b2/config/CMakeLists.txt +++ b/clients/b2/config/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib ) set(kwin_b2_config_PART_SRCS config.cpp ) -kde4_automoc(${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 d32aa294f4..366f93c1b9 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory( config ) set(kwin3_default_PART_SRCS kdedefault.cpp) -kde4_automoc(${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 aef7f81eb4..acb7919360 100644 --- a/clients/default/config/CMakeLists.txt +++ b/clients/default/config/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwin_default_config_PART_SRCS config.cpp ) -kde4_automoc(${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 711ff34d3e..7911797f5b 100644 --- a/clients/keramik/CMakeLists.txt +++ b/clients/keramik/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory( config ) set(kwin3_keramik_PART_SRCS keramik.cpp ) -kde4_automoc(${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 acc0d6eb44..a35ec5e47c 100644 --- a/clients/keramik/config/CMakeLists.txt +++ b/clients/keramik/config/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib ) set(kwin_keramik_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_keramik_config_PART_SRCS}) kde4_add_ui_files(kwin_keramik_config_PART_SRCS keramikconfig.ui ) diff --git a/clients/kwmtheme/CMakeLists.txt b/clients/kwmtheme/CMakeLists.txt index 5761318848..8b601112a7 100644 --- a/clients/kwmtheme/CMakeLists.txt +++ b/clients/kwmtheme/CMakeLists.txt @@ -9,7 +9,6 @@ add_subdirectory( pics ) set(kwin3_kwmtheme_PART_SRCS kwmthemeclient.cpp ) -kde4_automoc(${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..dfb951d2ca 100644 --- a/clients/kwmtheme/cli_installer/CMakeLists.txt +++ b/clients/kwmtheme/cli_installer/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwmtheme_SRCS main.cpp ) -kde4_automoc(${kwmtheme_SRCS}) kde4_add_executable(kwmtheme ${kwmtheme_SRCS}) diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index 6220586966..02ac135c25 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -3,7 +3,6 @@ set(kwin3_laptop_PART_SRCS laptopclient.cpp) -kde4_automoc(${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 021ad67c7c..d2396ae0d9 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory( config ) set(kwin3_modernsys_PART_SRCS modernsys.cpp) -kde4_automoc(${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 191b0abb7b..612318e188 100644 --- a/clients/modernsystem/config/CMakeLists.txt +++ b/clients/modernsystem/config/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwin_modernsys_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_modernsys_config_PART_SRCS}) kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS}) diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index 32cde825b1..1085d90823 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -7,7 +7,6 @@ set(kwin_oxy_SRCS definitions.cpp ) -kde4_automoc(${kwin_oxy_SRCS}) kde4_add_plugin(kwin3_oxy ${kwin_oxy_SRCS}) diff --git a/clients/plastik/CMakeLists.txt b/clients/plastik/CMakeLists.txt index 63fdb3ccb7..c82110dc1b 100644 --- a/clients/plastik/CMakeLists.txt +++ b/clients/plastik/CMakeLists.txt @@ -9,7 +9,6 @@ set(kwin3_plastik_PART_SRCS plastikbutton.cpp misc.cpp ) -kde4_automoc(${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 4479a4a5b9..90c01d94b0 100644 --- a/clients/plastik/config/CMakeLists.txt +++ b/clients/plastik/config/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwin_plastik_config_PART_SRCS config.cpp ) -kde4_automoc(${kwin_plastik_config_PART_SRCS}) kde4_add_ui_files(kwin_plastik_config_PART_SRCS configdialog.ui ) diff --git a/clients/quartz/CMakeLists.txt b/clients/quartz/CMakeLists.txt index 337f099b81..6858d17187 100644 --- a/clients/quartz/CMakeLists.txt +++ b/clients/quartz/CMakeLists.txt @@ -8,7 +8,6 @@ add_subdirectory( config ) set(kwin3_quartz_PART_SRCS quartz.cpp ) -kde4_automoc(${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 223a79356e..708efe5f93 100644 --- a/clients/quartz/config/CMakeLists.txt +++ b/clients/quartz/config/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwin_quartz_config_PART_SRCS config.cpp ) -kde4_automoc(${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 92df20a536..eb3161251e 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -3,7 +3,6 @@ set(kwin3_redmond_PART_SRCS redmond.cpp) -kde4_automoc(${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 107da18bb5..050e71c48e 100644 --- a/clients/test/CMakeLists.txt +++ b/clients/test/CMakeLists.txt @@ -6,7 +6,6 @@ set(kwin3_test_PART_SRCS test.cpp ) -kde4_automoc(${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 9b9be6e936..af8ba67a5c 100644 --- a/clients/web/CMakeLists.txt +++ b/clients/web/CMakeLists.txt @@ -6,7 +6,6 @@ set(kwin3_web_PART_SRCS Web.cpp WebButton.cpp ) -kde4_automoc(${kwin3_web_PART_SRCS}) kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS}) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 07c119922e..9e367866f8 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -6,7 +6,6 @@ set(kwin_xml ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml) set(kwin_update_window_settings_SRCS update_window_settings.cpp ) -kde4_automoc(${kwin_update_window_settings_SRCS}) kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS}) @@ -18,7 +17,6 @@ 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_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS}) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index b3490ed076..93a3d660ac 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -1,13 +1,11 @@ # Adds effect plugin with given name. Sources are given after the name macro(KWIN4_ADD_EFFECT name) - kde4_automoc(${ARGN}) kde4_add_plugin(kwin4_effect_${name} ${ARGN}) target_link_libraries(kwin4_effect_${name} kwineffects ${KDE4_KDEUI_LIBS}) install(TARGETS kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR}) endmacro(KWIN4_ADD_EFFECT) macro(KWIN4_ADD_EFFECT_CONFIG name) - kde4_automoc(${ARGN}) kde4_add_plugin(kcm_kwin4_effect_${name} ${ARGN}) target_link_libraries(kcm_kwin4_effect_${name} kwineffects ${KDE4_KDEUI_LIBS}) install(TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 28fabaf34a..382f225a23 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -3,7 +3,6 @@ set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) -kde4_automoc(${kcm_kwindecoration_PART_SRCS}) kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS}) diff --git a/kcmkwin/kwineffects/CMakeLists.txt b/kcmkwin/kwineffects/CMakeLists.txt index f3dff5c390..0b7b6778b6 100644 --- a/kcmkwin/kwineffects/CMakeLists.txt +++ b/kcmkwin/kwineffects/CMakeLists.txt @@ -1,7 +1,6 @@ ########### next target ############### set(kcm_kwineffects_PART_SRCS main.cpp ) -kde4_automoc(${kcm_kwineffects_PART_SRCS}) kde4_add_plugin(kcm_kwineffects ${kcm_kwineffects_PART_SRCS}) target_link_libraries(kcm_kwineffects ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS}) install(TARGETS kcm_kwineffects DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index 702a8b90b1..775df85ab3 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -6,7 +6,6 @@ set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp ) -kde4_automoc(${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 67335ca45c..b7e208e0d5 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -8,7 +8,6 @@ kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui editshortcutbase.ui ) set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS}) -kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS}) kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}) @@ -23,7 +22,6 @@ 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_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 12605a7571..7e122acfb9 100644 --- a/killer/CMakeLists.txt +++ b/killer/CMakeLists.txt @@ -5,7 +5,6 @@ set(kwin_killer_helper_SRCS killer.cpp ) -kde4_automoc(${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 7ac21741b7..ca0220d128 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -10,7 +10,6 @@ set(kdecorations_LIB_SRCS kdecorationfactory.cpp kcommondecoration.cpp ) -kde4_automoc(${kdecorations_LIB_SRCS}) kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS}) @@ -32,7 +31,6 @@ set(kwin_EFFECTSLIB_SRCS kwinglutils_funcs.cpp kwinshadereffect.cpp ) -kde4_automoc(${kwin_EFFECTSLIB_SRCS}) kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS}) target_link_libraries(kwineffects ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES}) set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4157ec181d..f0e41902f0 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory( decobenchmark ) set(test_gravity_SRCS test_gravity.cpp ) -kde4_automoc(${test_gravity_SRCS}) kde4_add_executable(test_gravity ${test_gravity_SRCS}) diff --git a/tools/decobenchmark/CMakeLists.txt b/tools/decobenchmark/CMakeLists.txt index 59215e72bb..8ad1dfe2c0 100644 --- a/tools/decobenchmark/CMakeLists.txt +++ b/tools/decobenchmark/CMakeLists.txt @@ -5,7 +5,6 @@ set(decobenchmark_SRCS main.cpp preview.cpp ) -kde4_automoc(${decobenchmark_SRCS}) kde4_add_executable(decobenchmark ${decobenchmark_SRCS})