yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Necessary to change KDE4_AUTOMOC macro to support

Browse source 
enable-final argument

(there was not a dependancy between <name>_final.cpp file and
moc generated files => moc files were never created)

Not necessary to rebuild all kdelibs just cp kdelibs/cmake/modules/KDE4Macros.cmake <path_kde4>/share/apps/cmake/modules

I ported and tested all kde module (without enable-final argument, it compiles fines (test and program))
Don't try to use enable-final argument for the moment it doesn't compile (but dependancy works)

Regards

svn path=/trunk/KDE/kdebase/workspace/; revision=595039
This commit is contained in:
Laurent Montel 2006-10-13 07:55:37 +00:00
parent e8e16726c1
commit 01f2a3a9f2
27 changed files with 33 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
CMakeLists.txt
View file

@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}
########### next target ############### ########### next target ###############
set(kwin_KDEINIT_SRCS set(kwin_KDEINIT_SRCS
kwinadaptor.cpp kwinadaptor.cpp
workspace.cpp workspace.cpp
client.cpp client.cpp
placement.cpp placement.cpp
@ -38,84 +38,25 @@ set(kwin_KDEINIT_SRCS
activation.cpp activation.cpp
useractions.cpp useractions.cpp
geometry.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_KDEINIT_SRCS}) kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
kde4_add_kdeinit_executable( 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 ${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} ) install(TARGETS kdeinit_kwin DESTINATION ${LIB_INSTALL_DIR} )
target_link_libraries( kwin kdeinit_kwin ) target_link_libraries( kwin kdeinit_kwin )
install(TARGETS kwin DESTINATION bin) install(TARGETS kwin DESTINATION ${BIN_INSTALL_DIR})
########### install files ############### ########### install files ###############
install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) 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

2
clients/b2/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_b2_PART_SRCS b2client.cpp) 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}) kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})

2
clients/b2/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin_b2_config_PART_SRCS config.cpp ) 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}) kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS})

2
clients/default/CMakeLists.txt
View file

@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_default_PART_SRCS kdedefault.cpp) 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}) kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS})

2
clients/default/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kwin_default_config_PART_SRCS config.cpp ) 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}) kde4_add_plugin(kwin_default_config ${kwin_default_config_PART_SRCS})

2
clients/keramik/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_keramik_PART_SRCS keramik.cpp ) 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 ) qt4_add_resources(kwin3_keramik_PART_SRCS tiles.qrc )

2
clients/keramik/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin_keramik_config_PART_SRCS config.cpp ) 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 ) kde4_add_ui3_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )

2
clients/kwmtheme/CMakeLists.txt
View file

@ -8,7 +8,7 @@ add_subdirectory( cli_installer )
set(kwin3_kwmtheme_PART_SRCS kwmthemeclient.cpp ) 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}) kde4_add_plugin(kwin3_kwmtheme ${kwin3_kwmtheme_PART_SRCS})

2
clients/kwmtheme/cli_installer/CMakeLists.txt
View file

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

2
clients/laptop/CMakeLists.txt
View file

@ -6,7 +6,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_laptop_PART_SRCS laptopclient.cpp) 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}) kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS})

2
clients/modernsystem/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_modernsys_PART_SRCS modernsys.cpp) 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}) kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS})

2
clients/modernsystem/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kwin_modernsys_config_PART_SRCS config.cpp ) 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}) kde4_add_plugin(kwin_modernsys_config ${kwin_modernsys_config_PART_SRCS})

2
clients/plastik/CMakeLists.txt
View file

@ -12,7 +12,7 @@ set(kwin3_plastik_PART_SRCS
plastikbutton.cpp plastikbutton.cpp
misc.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}) kde4_add_plugin(kwin3_plastik ${kwin3_plastik_PART_SRCS})

2
clients/plastik/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kwin_plastik_config_PART_SRCS config.cpp ) 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 ) kde4_add_ui3_files(kwin_plastik_config_PART_SRCS configdialog.ui )

2
clients/quartz/CMakeLists.txt
View file

@ -8,7 +8,7 @@ add_subdirectory( config )
set(kwin3_quartz_PART_SRCS quartz.cpp ) 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}) kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS})

2
clients/quartz/config/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kwin_quartz_config_PART_SRCS config.cpp ) 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}) kde4_add_plugin(kwin_quartz_config ${kwin_quartz_config_PART_SRCS})

2
clients/redmond/CMakeLists.txt
View file

@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kwin3_redmond_PART_SRCS redmond.cpp) 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}) kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS})

2
clients/test/CMakeLists.txt
View file

@ -6,7 +6,7 @@
set(kwin3_test_PART_SRCS test.cpp ) 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}) kde4_add_plugin(kwin3_test ${kwin3_test_PART_SRCS})

2
clients/web/CMakeLists.txt
View file

@ -6,7 +6,7 @@
set(kwin3_web_PART_SRCS Web.cpp WebButton.cpp ) 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}) kde4_add_plugin(kwin3_web ${kwin3_web_PART_SRCS})

4
data/CMakeLists.txt
View file

@ -4,7 +4,7 @@
########### next target ############### ########### next target ###############
set(kwin_update_window_settings_SRCS update_window_settings.cpp) 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}) 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 ############### ########### next target ###############
set(kwin_update_default_rules_SRCS update_default_rules.cpp) 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}) kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})

2
kcmkwin/kwindecoration/CMakeLists.txt
View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) 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}) kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})

2
kcmkwin/kwinoptions/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp ) 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}) kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})

4
kcmkwin/kwinrules/CMakeLists.txt
View file

@ -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}) 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}) 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}) 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}) kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})

2
killer/CMakeLists.txt
View file

@ -5,7 +5,7 @@
set(kwin_killer_helper_SRCS killer.cpp ) 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}) kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})

2
lib/CMakeLists.txt
View file

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

2
tools/CMakeLists.txt
View file

@ -7,7 +7,7 @@ add_subdirectory( decobenchmark )
set(test_gravity_SRCS test_gravity.cpp ) 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}) kde4_add_executable(test_gravity ${test_gravity_SRCS})

2
tools/decobenchmark/CMakeLists.txt
View file

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