kdeplasma-addons: rely on CMake to generate moc files, fixes issue #2

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt
index ec6637c..0e96ebb 100644 (file)
--- a/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt
+++ b/kdeplasma-addons/applets/kimpanel/backend/ibus/CMakeLists.txt
@@ -22,9 +22,8 @@ if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND)
             ibus15/main.cpp
             ibus15/panel.cpp
             ibus15/propertymanager.cpp)
-        qt4_wrap_cpp(plasma_applet_kimpanel_MOCS ibus15/app.h)
         add_definitions(-DQT_NO_KEYWORDS)
-        add_executable(kimpanel-ibus-panel ${kimpanel_ibus_panel_SRCS} ${plasma_applet_kimpanel_MOCS})
+        add_executable(kimpanel-ibus-panel ${kimpanel_ibus_panel_SRCS})
         target_link_libraries(kimpanel-ibus-panel ${IBUS_LIBRARIES} ${GLIB2_LIBRARIES} ${GIO_LIBRARIES} ${GOBJECT_LIBRARIES}  ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY})
     endif()
     install(TARGETS kimpanel-ibus-panel DESTINATION ${LIBEXEC_INSTALL_DIR})

diff --git a/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt b/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt
index 1945331..da68058 100644 (file)
--- a/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt
+++ b/kdeplasma-addons/applets/kimpanel/backend/scim/CMakeLists.txt
@@ -4,7 +4,6 @@ if(SCIM_FOUND)
     set(SCIM_ICON_DIR "${PC_SCIM_PREFIX}/share/scim/icons")
     configure_file(config-scim.h.cmake config-scim.h)
     set(kimpanel_scim_panel_SRCS main.cpp)
-    qt4_generate_moc(${kimpanel_scim_panel_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/main.moc)
     add_executable(kimpanel-scim-panel ${kimpanel_scim_panel_SRCS})
     target_link_libraries(kimpanel-scim-panel ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${SCIM_LIBRARIES})
     install(TARGETS kimpanel-scim-panel DESTINATION ${LIBEXEC_INSTALL_DIR})