Merging from old trunk:

r598290 | mlaurent | 2006-10-23 08:53:27 +0200 (Mon, 23 Oct 2006) | 5 lines

Apply Alex patch (now we can use enable-final argument
some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro


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

CMakeLists.txt

@@ -60,7 +60,7 @@ set(kwin_KDEINIT_SRCS
 
 qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace )
 
-kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
+kde4_automoc(${kwin_KDEINIT_SRCS})
 
 
 kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})

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 ${kwin3_b2_PART_SRCS})
+kde4_automoc(${kwin3_b2_PART_SRCS})
 
 kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})
 

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 ${kwin_b2_config_PART_SRCS})
+kde4_automoc(${kwin_b2_config_PART_SRCS})
 
 kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS})
 

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 ${kwin3_default_PART_SRCS})
+kde4_automoc(${kwin3_default_PART_SRCS})
 
 kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS})
 

clients/default/config/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwin_default_config_PART_SRCS config.cpp )
 
-kde4_automoc(kwin_default_config ${kwin_default_config_PART_SRCS})
+kde4_automoc(${kwin_default_config_PART_SRCS})
 
 kde4_add_plugin(kwin_default_config ${kwin_default_config_PART_SRCS})
 

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 ${kwin3_keramik_PART_SRCS})
+kde4_automoc(${kwin3_keramik_PART_SRCS})
 
 qt4_add_resources(kwin3_keramik_PART_SRCS tiles.qrc )
 

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 ${kwin_keramik_config_PART_SRCS})
+kde4_automoc(${kwin_keramik_config_PART_SRCS})
 
 kde4_add_ui3_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )
 

clients/kwmtheme/CMakeLists.txt

@@ -8,7 +8,7 @@ add_subdirectory( cli_installer )
 
 set(kwin3_kwmtheme_PART_SRCS kwmthemeclient.cpp )
 
-kde4_automoc(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS})
+kde4_automoc(${kwin3_kwmtheme_PART_SRCS})
 
 kde4_add_plugin(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS})
 

clients/kwmtheme/cli_installer/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwmtheme_SRCS main.cpp )
 
-kde4_automoc(kwmtheme ${kwmtheme_SRCS})
+kde4_automoc(${kwmtheme_SRCS})
 
 kde4_add_executable(kwmtheme ${kwmtheme_SRCS})
 

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 ${kwin3_laptop_PART_SRCS})
+kde4_automoc(${kwin3_laptop_PART_SRCS})
 
 kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS})
 

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 ${kwin3_modernsys_PART_SRCS})
+kde4_automoc(${kwin3_modernsys_PART_SRCS})
 
 kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS})
 

clients/modernsystem/config/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwin_modernsys_config_PART_SRCS config.cpp )
 
-kde4_automoc(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})
+kde4_automoc(${kwin_modernsys_config_PART_SRCS})
 
 kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})
 

clients/plastik/CMakeLists.txt

@@ -12,7 +12,7 @@ set(kwin3_plastik_PART_SRCS
    plastikbutton.cpp 
    misc.cpp )
 
-kde4_automoc(kwin3_plastik ${kwin3_plastik_PART_SRCS})
+kde4_automoc(${kwin3_plastik_PART_SRCS})
 
 kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS})
 

clients/plastik/config/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwin_plastik_config_PART_SRCS config.cpp )
 
-kde4_automoc(kwin_plastik_config ${kwin_plastik_config_PART_SRCS})
+kde4_automoc(${kwin_plastik_config_PART_SRCS})
 
 kde4_add_ui3_files(kwin_plastik_config_PART_SRCS configdialog.ui )
 

clients/quartz/CMakeLists.txt

@@ -8,7 +8,7 @@ add_subdirectory( config )
 
 set(kwin3_quartz_PART_SRCS quartz.cpp )
 
-kde4_automoc(kwin3_quartz ${kwin3_quartz_PART_SRCS})
+kde4_automoc(${kwin3_quartz_PART_SRCS})
 
 kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS})
 

clients/quartz/config/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwin_quartz_config_PART_SRCS config.cpp )
 
-kde4_automoc(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
+kde4_automoc(${kwin_quartz_config_PART_SRCS})
 
 kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})
 

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 ${kwin3_redmond_PART_SRCS})
+kde4_automoc(${kwin3_redmond_PART_SRCS})
 
 kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS})
 

clients/test/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 set(kwin3_test_PART_SRCS test.cpp )
 
-kde4_automoc(kwin3_test ${kwin3_test_PART_SRCS})
+kde4_automoc(${kwin3_test_PART_SRCS})
 
 kde4_add_plugin(kwin3_test ${kwin3_test_PART_SRCS})
 

clients/web/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 set(kwin3_web_PART_SRCS Web.cpp WebButton.cpp )
 
-kde4_automoc(kwin3_web ${kwin3_web_PART_SRCS})
+kde4_automoc(${kwin3_web_PART_SRCS})
 
 kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS})
 

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 ${kwin_update_window_settings_SRCS})
+kde4_automoc(${kwin_update_window_settings_SRCS})
 
 kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS})
 
@@ -16,7 +16,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 ${kwin_update_default_rules})
+kde4_automoc(${kwin_update_default_rules})
 
 kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
 

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 ${kcm_kwindecoration_PART_SRCS})
+kde4_automoc(${kcm_kwindecoration_PART_SRCS})
 
 
 kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})

kcmkwin/kwinoptions/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
 
-kde4_automoc(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
+kde4_automoc(${kcm_kwinoptions_PART_SRCS})
 
 kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
 

kcmkwin/kwinrules/CMakeLists.txt

@@ -11,7 +11,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 ${kwin_rules_dialog_KDEINIT_SRCS})
+kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS})
 
 kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
 
@@ -26,7 +26,7 @@ install(TARGETS kwin_rules_dialog DESTINATION ${BIN_INSTALL_DIR})
 
 set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS})
 
-kde4_automoc(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
+kde4_automoc(${kcm_kwinrules_PART_SRCS})
 
 kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
 

killer/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(kwin_killer_helper_SRCS killer.cpp )
 
-kde4_automoc(kwin_killer_helper ${kwin_killer_helper_SRCS})
+kde4_automoc(${kwin_killer_helper_SRCS})
 
 kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
 

lib/CMakeLists.txt

@@ -10,7 +10,7 @@ set(kdecorations_LIB_SRCS
    kdecorationfactory.cpp 
    kcommondecoration.cpp )
 
-kde4_automoc(kdecorations ${kdecorations_LIB_SRCS})
+kde4_automoc(${kdecorations_LIB_SRCS})
 
 kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
 

tools/CMakeLists.txt

@@ -7,7 +7,7 @@ add_subdirectory( decobenchmark )
 
 set(test_gravity_SRCS test_gravity.cpp )
 
-kde4_automoc(test_gravity ${test_gravity_SRCS})
+kde4_automoc(${test_gravity_SRCS})
 
 kde4_add_executable(test_gravity ${test_gravity_SRCS})
 

tools/decobenchmark/CMakeLists.txt

@@ -5,7 +5,7 @@
 
 set(decobenchmark_SRCS main.cpp preview.cpp )
 
-kde4_automoc(decobenchmark ${decobenchmark_SRCS})
+kde4_automoc(${decobenchmark_SRCS})
 
 kde4_add_executable(decobenchmark ${decobenchmark_SRCS})