[Marble-commits] branches/KDE/4.6/kdeedu/marble

[Dennis Nienhüser]

SVN commit 1213217 by nienhueser:

Don't link declarative plugins against KDE libs. It is not needed and somehow breaks plugin loading in qmlviewer.
Backport of commit 1213214.

 M  +0 -17     MarbleMacros.cmake  


--- branches/KDE/4.6/kdeedu/marble/MarbleMacros.cmake #1213216:1213217
@@ -87,7 +87,6 @@
 
 macro( marble_add_declarative_plugin _target_name )
 set( _src ${ARGN} )
-if( QTONLY )
     qt4_automoc( ${_src} )
     add_library( ${_target_name} MODULE ${_src} )
     target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
@@ -100,22 +99,6 @@
                                            ${${_target_name}_LIBS}
                                            marblewidget )
     install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/org/kde/edu/marble )
-else( QTONLY )
-    kde4_add_plugin( ${_target_name} ${_src} )
-    target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
-                                           ${QT_QTDBUS_LIBRARY}
-                                           ${QT_QTGUI_LIBRARY}
-                                           ${QT_QTXML_LIBRARY}
-                                           ${QT_QTSVG_LIBRARY}
-                                           ${QT_QTNETWORK_LIBRARY}
-                                           ${KDE4_KDECORE_LIBRARY}
-                                           ${KDE4_KDEUI_LIBRARY}
-                                           ${KDE4_KIO_LIBRARY}
-                                           ${QT_QTMAIN_LIBRARY}
-                                           ${${_target_name}_LIBS}
-                                           marblewidget )
-    install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/org/kde/edu/marble )
-endif( QTONLY )
 
 set_target_properties( ${_target_name} PROPERTIES
                        INSTALL_RPATH_USE_LINK_PATH TRUE