[Marble-commits] KDE/kdeedu/marble

[Dennis Nienhüser]

SVN commit 1195747 by nienhueser:

QtDeclarative bindings

 M  +40 -0     MarbleMacros.cmake  
 M  +1 -0      src/plugins/CMakeLists.txt  
 A             src/plugins/declarative (directory)  
 A             src/plugins/declarative/CMakeLists.txt  
 A             src/plugins/declarative/DeclarativeMapThemeManager.cpp   [License: LGPL]
 A             src/plugins/declarative/DeclarativeMapThemeManager.h   [License: LGPL]
 A             src/plugins/declarative/MapTheme.cpp   [License: LGPL]
 A             src/plugins/declarative/MapTheme.h   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativePlugin.cpp   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativePlugin.h   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativeRunnerManager.cpp   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativeRunnerManager.h   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativeWidget.cpp   [License: LGPL]
 A             src/plugins/declarative/MarbleDeclarativeWidget.h   [License: LGPL]
 A             src/plugins/declarative/Placemark.cpp   [License: LGPL]
 A             src/plugins/declarative/Placemark.h   [License: LGPL]
 A             src/plugins/declarative/qmldir  


--- trunk/KDE/kdeedu/marble/MarbleMacros.cmake #1195746:1195747
@@ -85,6 +85,46 @@
 
 endmacro( marble_add_designer_plugin _target_name )
 
+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}
+                                           ${QT_QTDBUS_LIBRARY}
+                                           ${QT_QTGUI_LIBRARY}
+                                           ${QT_QTXML_LIBRARY}
+                                           ${QT_QTSVG_LIBRARY}
+                                           ${QT_QTNETWORK_LIBRARY}
+                                           ${QT_QTMAIN_LIBRARY}
+                                           ${${_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
+                       SKIP_BUILD_RPATH TRUE
+                       BUILD_WITH_INSTALL_RPATH TRUE
+                     )
+
+endmacro( marble_add_declarative_plugin _target_name )
+
 if( WIN32 )
     set( DATA_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_DATA_PATH} )
     set( PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${MARBLE_PLUGIN_PATH} )
--- trunk/KDE/kdeedu/marble/src/plugins/CMakeLists.txt #1195746:1195747
@@ -1,4 +1,5 @@
 add_subdirectory( designer )
+add_subdirectory( declarative )
 add_subdirectory( render )
 add_subdirectory( runner )
 add_subdirectory( network )