From 2c539daa5ded813a66856ce9ef75ccb84c414c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 29 Apr 2007 22:04:13 +0000 Subject: [PATCH] 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 | 2 +- clients/b2/CMakeLists.txt | 2 +- clients/b2/config/CMakeLists.txt | 2 +- clients/default/CMakeLists.txt | 2 +- clients/default/config/CMakeLists.txt | 2 +- clients/keramik/CMakeLists.txt | 2 +- clients/keramik/config/CMakeLists.txt | 2 +- clients/kwmtheme/CMakeLists.txt | 2 +- clients/kwmtheme/cli_installer/CMakeLists.txt | 2 +- clients/laptop/CMakeLists.txt | 2 +- clients/modernsystem/CMakeLists.txt | 2 +- clients/modernsystem/config/CMakeLists.txt | 2 +- clients/plastik/CMakeLists.txt | 2 +- clients/plastik/config/CMakeLists.txt | 2 +- clients/quartz/CMakeLists.txt | 2 +- clients/quartz/config/CMakeLists.txt | 2 +- clients/redmond/CMakeLists.txt | 2 +- clients/test/CMakeLists.txt | 2 +- clients/web/CMakeLists.txt | 2 +- data/CMakeLists.txt | 4 ++-- kcmkwin/kwindecoration/CMakeLists.txt | 2 +- kcmkwin/kwinoptions/CMakeLists.txt | 2 +- kcmkwin/kwinrules/CMakeLists.txt | 4 ++-- killer/CMakeLists.txt | 2 +- lib/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 2 +- tools/decobenchmark/CMakeLists.txt | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0c775be3e..ca9ff933fa 100644 --- a/CMakeLists.txt +++ b/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}) diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index f07a0f0c92..9aa3f29712 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 ${kwin3_b2_PART_SRCS}) +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 c3abb19fb2..664c25fdba 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 ${kwin_b2_config_PART_SRCS}) +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 a315163ed3..df65a1d129 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 ${kwin3_default_PART_SRCS}) +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 7334fad85f..aef7f81eb4 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 ${kwin_default_config_PART_SRCS}) +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 a7768475ed..be580b0ea7 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 ${kwin3_keramik_PART_SRCS}) +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 3184901c1d..25a7448bfd 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 ${kwin_keramik_config_PART_SRCS}) +kde4_automoc(${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 8adac8dc40..05596b01c6 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 ${kwin3_kwmtheme_PART_SRCS}) +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 9e6301f468..3ce35ba12e 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 ${kwmtheme_SRCS}) +kde4_automoc(${kwmtheme_SRCS}) kde4_add_executable(kwmtheme ${kwmtheme_SRCS}) diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index 1f891e6382..d452635c49 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 ${kwin3_laptop_PART_SRCS}) +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 76546d967f..43a8e20435 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 ${kwin3_modernsys_PART_SRCS}) +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 5122563ff8..191b0abb7b 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 ${kwin_modernsys_config_PART_SRCS}) +kde4_automoc(${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 ed24e47f17..91adf5bea3 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 ${kwin3_plastik_PART_SRCS}) +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 72f3e43dc6..d5161f32eb 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 ${kwin_plastik_config_PART_SRCS}) +kde4_automoc(${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 5a3c2fe4a0..337f099b81 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 ${kwin3_quartz_PART_SRCS}) +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 19818fd2bb..223a79356e 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 ${kwin_quartz_config_PART_SRCS}) +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 4b195f7791..7d374aeb08 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 ${kwin3_redmond_PART_SRCS}) +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 c766f1cbbe..107da18bb5 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 ${kwin3_test_PART_SRCS}) +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 d07cb5b350..9b9be6e936 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 ${kwin3_web_PART_SRCS}) +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 5d173604d6..9af950c4e4 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 ${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}) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 29a8143bc1..eaf5a8707f 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 ${kcm_kwindecoration_PART_SRCS}) +kde4_automoc(${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 370086852c..a214bef109 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 ${kcm_kwinoptions_PART_SRCS}) +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 c6fd09d2b0..4f7029eeac 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/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}) diff --git a/killer/CMakeLists.txt b/killer/CMakeLists.txt index 3429d57ebd..12605a7571 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 ${kwin_killer_helper_SRCS}) +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 018b31a7ae..61db9cd7a5 100644 --- a/lib/CMakeLists.txt +++ b/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}) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index eca2d34fa0..4157ec181d 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 ${test_gravity_SRCS}) +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 ed22c4eb16..59215e72bb 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 ${decobenchmark_SRCS}) +kde4_automoc(${decobenchmark_SRCS}) kde4_add_executable(decobenchmark ${decobenchmark_SRCS})