Necessary to change KDE4_AUTOMOC macro to support

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/konqueror/; revision=595039
This commit is contained in:
Laurent Montel 2006-10-13 07:55:37 +00:00
parent 8c0db71c15
commit 9bba68d81a
38 changed files with 48 additions and 48 deletions

View file

@ -7,7 +7,7 @@ add_subdirectory( kcm )
set(kdepasswd_SRCS kdepasswd.cpp passwd.cpp passwddlg.cpp )
kde4_automoc(${kdepasswd_SRCS})
kde4_automoc(kdepasswd ${kdepasswd_SRCS})
kde4_add_executable(kdepasswd ${kdepasswd_SRCS})

View file

@ -7,7 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(kcm_useraccount_PART_SRCS chfnprocess.cpp main.cpp chfacedlg.cpp )
kde4_automoc(${kcm_useraccount_PART_SRCS})
kde4_automoc(kcm_useraccount ${kcm_useraccount_PART_SRCS})
kde4_add_ui_files(kcm_useraccount_PART_SRCS main_widget.ui )

View file

@ -11,7 +11,7 @@ set(kdialog_SRCS
qt4_add_dbus_adaptor( kdialog_SRCS org.kde.kdialog.ProgressDialog.xml progressdialog.h KProgressDialog )
kde4_automoc(${kdialog_SRCS})
kde4_automoc(kdialog ${kdialog_SRCS})
kde4_add_executable(kdialog ${kdialog_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(kbookmarkmerger_SRCS kbookmarkmerger.cpp )
kde4_automoc(${kbookmarkmerger_SRCS})
kde4_automoc(kbookmarkmerger ${kbookmarkmerger_SRCS})
kde4_add_executable(kbookmarkmerger ${kbookmarkmerger_SRCS})
@ -34,7 +34,7 @@ set(keditbookmarks_KDEINIT_SRCS
bookmarklistview.cpp
treeitem.cpp )
kde4_automoc(${keditbookmarks_KDEINIT_SRCS})
kde4_automoc(keditbookmarks ${keditbookmarks_KDEINIT_SRCS})

View file

@ -9,7 +9,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(libkfindcommon_SRCS kftabdlg.cpp kfind.cpp kquery.cpp kdatecombo.cpp)
set(kfindpart_PART_SRCS kfindpart.cpp ${libkfindcommon_SRCS})
kde4_automoc(${kfindpart_PART_SRCS})
kde4_automoc(kfindpart ${kfindpart_PART_SRCS})
kde4_add_plugin(kfindpart WITH_PREFIX ${kfindpart_PART_SRCS})
@ -24,7 +24,7 @@ install(TARGETS kfindpart DESTINATION ${PLUGIN_INSTALL_DIR} )
set(kfind_SRCS kfwin.cpp kfinddlg.cpp main.cpp ${libkfindcommon_SRCS})
kde4_automoc(${kfind_SRCS})
kde4_automoc(kfind ${kfind_SRCS})
kde4_add_executable(kfind ${kfind_SRCS})

View file

@ -55,7 +55,7 @@ set(konqueror_KDEINIT_SRCS ${libkonqueror_intern_SRCS}
KonqViewAdaptor.cpp
)
kde4_automoc(${konqueror_KDEINIT_SRCS})
kde4_automoc(konqueror ${konqueror_KDEINIT_SRCS})
kde4_add_kdeinit_executable( konqueror ${konqueror_KDEINIT_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(konq_aboutpage_PART_SRCS konq_aboutpage.cc )
kde4_automoc(${konq_aboutpage_PART_SRCS})
kde4_automoc(konq_aboutpage ${konq_aboutpage_PART_SRCS})
kde4_add_plugin(konq_aboutpage ${konq_aboutpage_PART_SRCS})

View file

@ -5,7 +5,7 @@ set(kfmclient_SRCS kfmclient.cpp )
qt4_add_dbus_interface( kfmclient_SRCS ../org.kde.Konqueror.Main.xml konq_main_interface )
qt4_add_dbus_interface( kfmclient_SRCS ../org.kde.Konqueror.MainWindow.xml konq_mainwindow_interface )
kde4_automoc(${kfmclient_SRCS})
kde4_automoc(kfmclient ${kfmclient_SRCS})
add_definitions(-DQT_NO_CAST_ASCII)

View file

@ -12,7 +12,7 @@ set(konq_part_PART_SRCS
konq_itemdelegate.cc
konq_iconviewitemdelegate.cc )
kde4_automoc(${konq_part_PART_SRCS})
kde4_automoc(konq_part ${konq_part_PART_SRCS})
kde4_add_plugin(konq_part ${konq_part_PART_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror )
set(konq_iconview_PART_SRCS konq_iconview.cc )
kde4_automoc(${konq_iconview_PART_SRCS})
kde4_automoc(konq_iconview ${konq_iconview_PART_SRCS})
kde4_add_plugin(konq_iconview ${konq_iconview_PART_SRCS})

View file

@ -5,7 +5,7 @@
set(khtmlkttsdplugin_PART_SRCS khtmlkttsd.cpp )
kde4_automoc(${khtmlkttsdplugin_PART_SRCS})
kde4_automoc(khtmlkttsdplugin ${khtmlkttsdplugin_PART_SRCS})
kde4_add_plugin(khtmlkttsdplugin WITH_PREFIX ${khtmlkttsdplugin_PART_SRCS})

View file

@ -14,7 +14,7 @@ set(konq_listview_PART_SRCS
konq_infolistviewwidget.cc
konq_infolistviewitem.cc )
kde4_automoc(${konq_listview_PART_SRCS})
kde4_automoc(konq_listview ${konq_listview_PART_SRCS})
kde4_add_kcfg_files(konq_listview_PART_SRCS konq_listviewsettings.kcfgc )

View file

@ -8,7 +8,7 @@ kde4_add_kcfg_files(kded_konqy_preloader_PART_SRCS ${CMAKE_SOURCE_DIR}/konqueror
qt4_add_dbus_adaptor(kded_konqy_preloader_PART_SRCS org.kde.konqueror.Preloader.xml preloader.h KonqyPreloader)
kde4_automoc(${kded_konqy_preloader_PART_SRCS})
kde4_automoc(kded_konqy_preloader ${kded_konqy_preloader_PART_SRCS})
kde4_add_plugin(kded_konqy_preloader ${kded_konqy_preloader_PART_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(konq_remoteencoding_PART_SRCS kremoteencodingplugin.cpp )
kde4_automoc(${konq_remoteencoding_PART_SRCS})
kde4_automoc(konq_remoteencoding ${konq_remoteencoding_PART_SRCS})
kde4_add_plugin(konq_remoteencoding ${konq_remoteencoding_PART_SRCS})

View file

@ -5,7 +5,7 @@
set(kcm_css_PART_SRCS template.cpp kcmcss.cpp )
kde4_automoc(${kcm_css_PART_SRCS})
kde4_automoc(kcm_css ${kcm_css_PART_SRCS})
kde4_add_ui3_files(kcm_css_PART_SRCS cssconfig.ui preview.ui )

View file

@ -3,7 +3,7 @@
set(kcm_kurifilt_PART_SRCS filteropts.cpp main.cpp )
kde4_automoc(${kcm_kurifilt_PART_SRCS})
kde4_automoc(kcm_kurifilt ${kcm_kurifilt_PART_SRCS})
kde4_add_plugin(kcm_kurifilt ${kcm_kurifilt_PART_SRCS})

View file

@ -7,7 +7,7 @@ set(libfiletypes_SRCS filetypedetails.cpp filegroupdetails.cpp kservicelistwidge
set(kcm_filetypes_PART_SRCS filetypesview.cpp ${libfiletypes_SRCS})
kde4_automoc(${kcm_filetypes_PART_SRCS})
kde4_automoc(kcm_filetypes ${kcm_filetypes_PART_SRCS})
kde4_add_plugin(kcm_filetypes ${kcm_filetypes_PART_SRCS})
@ -22,7 +22,7 @@ install(TARGETS kcm_filetypes DESTINATION ${PLUGIN_INSTALL_DIR} )
set(keditfiletype_SRCS keditfiletype.cpp ${libfiletypes_SRCS})
kde4_automoc(${keditfiletype_SRCS})
kde4_automoc(keditfiletype ${keditfiletype_SRCS})
kde4_add_executable(keditfiletype ${keditfiletype_SRCS})

View file

@ -24,7 +24,7 @@ set(kcm_kio_PART_SRCS
ksaveioconfig.cpp
socks.cpp )
kde4_automoc(${kcm_kio_PART_SRCS})
kde4_automoc(kcm_kio ${kcm_kio_PART_SRCS})
kde4_add_ui_files(kcm_kio_PART_SRCS cache_ui.ui)

View file

@ -13,7 +13,7 @@ set(kcm_konq_PART_SRCS
konqkcmfactory.cpp
desktopbehavior_impl.cpp )
kde4_automoc(${kcm_konq_PART_SRCS})
kde4_automoc(kcm_konq ${kcm_konq_PART_SRCS})
kde4_add_ui3_files(kcm_konq_PART_SRCS desktopbehavior.ui )

View file

@ -18,7 +18,7 @@ set(kcm_konqhtml_PART_SRCS
domainlistview.cpp
filteropts.cpp )
kde4_automoc(${kcm_konqhtml_PART_SRCS})
kde4_automoc(kcm_konqhtml ${kcm_konqhtml_PART_SRCS})
kde4_add_ui_files(kcm_konqhtml_PART_SRCS nsconfigwidget.ui advancedTabOptions.ui )

View file

@ -5,7 +5,7 @@
set(kcm_performance_PART_SRCS kcmperformance.cpp konqueror.cpp system.cpp )
kde4_automoc(${kcm_performance_PART_SRCS})
kde4_automoc(kcm_performance ${kcm_performance_PART_SRCS})
kde4_add_ui3_files(kcm_performance_PART_SRCS konqueror_ui.ui system_ui.ui )

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq )
set(konq_shellcmdplugin_PART_SRCS kshellcmdexecutor.cpp kshellcmddialog.cpp kshellcmdplugin.cpp )
kde4_automoc(${konq_shellcmdplugin_PART_SRCS})
kde4_automoc(konq_shellcmdplugin ${konq_shellcmdplugin_PART_SRCS})
kde4_add_plugin(konq_shellcmdplugin ${konq_shellcmdplugin_PART_SRCS})

View file

@ -9,7 +9,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/kate/lib )
set(konqsidebarplugin_LIB_SRCS konqsidebarplugin.cpp )
kde4_automoc(${konqsidebarplugin_LIB_SRCS})
kde4_automoc(konqsidebarplugin ${konqsidebarplugin_LIB_SRCS})
kde4_add_library(konqsidebarplugin SHARED ${konqsidebarplugin_LIB_SRCS})
@ -23,7 +23,7 @@ install(TARGETS konqsidebarplugin DESTINATION ${LIB_INSTALL_DIR} )
set(konq_sidebar_PART_SRCS konqsidebar.cpp sidebar_widget.cpp )
kde4_automoc(${konq_sidebar_PART_SRCS})
kde4_automoc(konq_sidebar ${konq_sidebar_PART_SRCS})
kde4_add_plugin(konq_sidebar ${konq_sidebar_PART_SRCS})

View file

@ -5,7 +5,7 @@
set(konq_sidebartest_PART_SRCS konqsidebartest.cpp )
kde4_automoc(${konq_sidebartest_PART_SRCS})
kde4_automoc(konq_sidebartest ${konq_sidebartest_PART_SRCS})
kde4_add_plugin(konq_sidebartest ${konq_sidebartest_PART_SRCS})

View file

@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/konqueror $
########### next target ###############
set(konqsidebar_tree_PART_SRCS konqsidebar_tree.cpp ${libkonq_sidebar_tree_SRCS})
kde4_automoc(${konqsidebar_tree_PART_SRCS})
kde4_automoc(konqsidebar_tree ${konqsidebar_tree_PART_SRCS})
kde4_add_plugin(konqsidebar_tree ${konqsidebar_tree_PART_SRCS})

View file

@ -9,7 +9,7 @@ include_directories(
set(konq_sidebartree_bookmarks_PART_SRCS bookmark_module.cpp bookmark_item.cpp ${libkonq_sidebar_tree_SRCS} )
kde4_automoc(${konq_sidebartree_bookmarks_PART_SRCS})
kde4_automoc(konq_sidebartree_bookmarks ${konq_sidebartree_bookmarks_PART_SRCS})
kde4_add_plugin(konq_sidebartree_bookmarks ${konq_sidebartree_bookmarks_PART_SRCS})

View file

@ -9,7 +9,7 @@ include_directories(
set(konq_sidebartree_dirtree_PART_SRCS dirtree_module.cpp dirtree_item.cpp ${libkonq_sidebar_tree_SRCS} )
kde4_automoc(${konq_sidebartree_dirtree_PART_SRCS})
kde4_automoc(konq_sidebartree_dirtree ${konq_sidebartree_dirtree_PART_SRCS})
kde4_add_plugin(konq_sidebartree_dirtree ${konq_sidebartree_dirtree_PART_SRCS})

View file

@ -9,7 +9,7 @@ include_directories(
set(konq_sidebartree_history_PART_SRCS history_module.cpp history_item.cpp history_settings.cpp ${libkonq_sidebar_tree_SRCS} )
kde4_automoc(${konq_sidebartree_history_PART_SRCS})
kde4_automoc(konq_sidebartree_history ${konq_sidebartree_history_PART_SRCS})
kde4_add_plugin(konq_sidebartree_history ${konq_sidebartree_history_PART_SRCS})
@ -25,7 +25,7 @@ install(TARGETS konq_sidebartree_history DESTINATION ${PLUGIN_INSTALL_DIR} )
set(kcm_history_PART_SRCS kcmhistory.cpp history_settings.cpp )
kde4_automoc(${kcm_history_PART_SRCS})
kde4_automoc(kcm_history ${kcm_history_PART_SRCS})
kde4_add_ui3_files(kcm_history_PART_SRCS history_dlg.ui )

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/konqueror/sidebar/ ${CMAKE_SOURCE_DIR}
set(konqsidebar_web_PART_SRCS web_module.cpp )
kde4_automoc(${konqsidebar_web_PART_SRCS})
kde4_automoc(konqsidebar_web ${konqsidebar_web_PART_SRCS})
kde4_add_plugin(konqsidebar_web ${konqsidebar_web_PART_SRCS})

View file

@ -8,7 +8,7 @@ if(KDE4_BUILD_TESTS)
########### konqviewmgrtest ###############
kde4_automoc(konqviewmgrtest.cpp)
kde4_automoc(konqviewmgrtest konqviewmgrtest.cpp)
kde4_add_executable(konqviewmgrtest RUN_UNINSTALLED konqviewmgrtest.cpp)

View file

@ -5,7 +5,7 @@
set(kwrite_KDEINIT_SRCS kwritemain.cpp )
kde4_automoc(${kwrite_KDEINIT_SRCS})
kde4_automoc(kwrite ${kwrite_KDEINIT_SRCS})
kde4_add_kdeinit_executable( kwrite ${kwrite_KDEINIT_SRCS})

View file

@ -34,7 +34,7 @@ set(konq_LIB_SRCS
konq_filetip.cc
konqmimedata.cpp )
kde4_automoc(${konq_LIB_SRCS})
kde4_automoc(konq ${konq_LIB_SRCS})
kde4_add_library(konq SHARED ${konq_LIB_SRCS})
@ -46,7 +46,7 @@ install(TARGETS konq DESTINATION ${LIB_INSTALL_DIR} )
########### next target ###############
set(konq_sound_LIB_SRCS konq_sound.cc)
kde4_automoc(${konq_sound_LIB_SRCS})
kde4_automoc(konq_sound ${konq_sound_LIB_SRCS})
kde4_add_plugin(konq_sound ${konq_sound_LIB_SRCS})
kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} konq_sound)
target_link_libraries(konq_sound ${KDE4_KDECORE_LIBS} ${KDE4_PHONONCORE_LIBRARY})

View file

@ -1,6 +1,6 @@
set(kded_favicons_SRCS favicons.cpp favicons_adaptor.cpp)
kde4_automoc(${kded_favicons_SRCS})
kde4_automoc(kded_favicons ${kded_favicons_SRCS})
kde4_add_plugin(kded_favicons ${kded_favicons_SRCS})

View file

@ -8,7 +8,7 @@ if(KDE4_BUILD_TESTS)
########### konqmimedatatest ###############
kde4_automoc(konqmimedatatest.cpp)
kde4_automoc(konqmimedatatest konqmimedatatest.cpp)
kde4_add_executable(konqmimedatatest RUN_UNINSTALLED konqmimedatatest.cpp)
@ -18,7 +18,7 @@ if(KDE4_BUILD_TESTS)
########### favicontest ###############
kde4_automoc(favicontest.cpp)
kde4_automoc(favicontest favicontest.cpp)
kde4_add_executable(favicontest RUN_UNINSTALLED favicontest.cpp)
@ -28,7 +28,7 @@ if(KDE4_BUILD_TESTS)
########### historymgrtest ###############
kde4_automoc(historymgrtest.cpp)
kde4_automoc(historymgrtest historymgrtest.cpp)
kde4_add_executable(historymgrtest RUN_UNINSTALLED historymgrtest.cpp)

View file

@ -15,7 +15,7 @@ if (X11_Xt_LIB)
viewer_proxy.cpp
)
kde4_automoc(${kcminit_nsplugin_PART_SRCS})
kde4_automoc(kcminit_nsplugin ${kcminit_nsplugin_PART_SRCS})
@ -33,7 +33,7 @@ install(TARGETS kcminit_nsplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
set(kcm_nsplugins_PART_SRCS kcm_nsplugins.cpp )
kde4_automoc(${kcm_nsplugins_PART_SRCS})
kde4_automoc(kcm_nsplugins ${kcm_nsplugins_PART_SRCS})
kde4_add_plugin(kcm_nsplugins ${kcm_nsplugins_PART_SRCS})
@ -48,7 +48,7 @@ install(TARGETS kcm_nsplugins DESTINATION ${PLUGIN_INSTALL_DIR} )
set(nspluginscan_SRCS pluginscan.cpp )
kde4_automoc(${nspluginscan_SRCS})
kde4_automoc(nspluginscan ${nspluginscan_SRCS})
kde4_add_executable(nspluginscan ${nspluginscan_SRCS})

View file

@ -6,7 +6,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libltdl ${CMAKE_CURRENT_BINARY_DIR}/..
if(KDE4_BUILD_TESTS)
set(testnsplugin_SRCS testnsplugin.cpp )
kde4_automoc(${testnsplugin_SRCS})
kde4_automoc(testnsplugin ${testnsplugin_SRCS})
kde4_add_executable(testnsplugin ${testnsplugin_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/nsplugins )
set(nspluginviewer_SRCS nsplugin.cpp viewer.cpp dbusadaptors.cpp callback_proxy.cpp)
kde4_automoc(${nspluginviewer_SRCS})
kde4_automoc(nspluginviewer ${nspluginviewer_SRCS})

View file

@ -5,7 +5,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/nsplugins )
set(nswrapper_LIB_SRCS wrapper.c )
kde4_automoc(${nswrapper_LIB_SRCS})
kde4_automoc(nswrapper ${nswrapper_LIB_SRCS})
kde4_add_library(nswrapper SHARED ${nswrapper_LIB_SRCS})