Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > f70f865b656a5d30dbc71524c8b3bb46 > files > 1

marble-17.12.2-1.1.mga6.src.rpm

diff -up marble-14.12.1/CMakeLists.txt.marblewidget marble-14.12.1/CMakeLists.txt
--- marble-14.12.1/CMakeLists.txt.marblewidget	2015-02-23 15:43:12.326429493 -0600
+++ marble-14.12.1/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -56,6 +56,7 @@ if(QT4_FOUND)
     FIND_PACKAGE(QtDeclarative)
     include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
   ENDIF()
+  set(MARBLEWIDGET marblewidget)
 else()
   set( QT5BUILD TRUE )
   IF( NOT QTONLY )
@@ -86,6 +87,7 @@ else()
   include_directories( ${Qt5Xml_INCLUDE_DIRS} )
   include_directories( ${Qt5Sql_INCLUDE_DIRS} )
 
+  set(MARBLEWIDGET marblewidget-qt5) 
   SET(CMAKE_AUTOMOC TRUE)
   SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
 endif()
diff -up marble-14.12.1/MarbleMacros.cmake.marblewidget marble-14.12.1/MarbleMacros.cmake
--- marble-14.12.1/MarbleMacros.cmake.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/MarbleMacros.cmake	2015-02-23 15:48:39.425063659 -0600
@@ -66,7 +66,7 @@ if( QTONLY )
                                            ${QT_QTNETWORK_LIBRARY}
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
-                                           marblewidget )
+                                           ${MARBLEWIDGET} )
     install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} )
 else( QTONLY )
     kde4_add_plugin( ${_target_name} ${_src} )
@@ -81,7 +81,7 @@ else( QTONLY )
                                            ${KDE4_KIO_LIBRARY}
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
-                                           marblewidget )
+                                           ${MARBLEWIDGET} )
     install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} )
 endif( QTONLY )
 
@@ -111,7 +111,7 @@ if( QTONLY )
                                            ${QT_QTNETWORK_LIBRARY}
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
-                                           marblewidget )
+                                           ${MARBLEWIDGET} )
     install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
 else( QTONLY )
     kde4_add_plugin( ${_target_name} ${_src} )
@@ -126,7 +126,7 @@ else( QTONLY )
                                            ${KDE4_KIO_LIBRARY}
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
-                                           marblewidget )
+                                           ${MARBLEWIDGET} )
     install( TARGETS ${_target_name} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
 endif( QTONLY )
 
@@ -150,7 +150,7 @@ target_link_libraries( ${_target_name} $
                                            ${QT_QTNETWORK_LIBRARY}
                                            ${QT_QTMAIN_LIBRARY}
                                            ${${_target_name}_LIBS}
-                                           marblewidget )
+                                           ${MARBLEWIDGET} )
 install( TARGETS ${_target_name} DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/marble/${_install_path} )
 
 set_target_properties( ${_target_name} PROPERTIES
@@ -186,7 +186,7 @@ macro( marble_add_test TEST_NAME )
                                             ${QT_QTGUI_LIBRARY} 
                                             ${QT_QTTEST_LIBRARY} 
                                             ${Qt5Test_LIBRARIES}
-                                            marblewidget )
+                                            ${MARBLEWIDGET} )
         set_target_properties( ${TEST_NAME} PROPERTIES 
                                COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
         add_test( ${TEST_NAME} ${TEST_NAME} )
diff -up marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-kde/CMakeLists.txt
--- marble-14.12.1/src/apps/marble-kde/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/apps/marble-kde/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -8,7 +8,7 @@ set(marblepart_SRCS marble_part.cpp)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui ${KDE4_INCLUDES})
 kde4_add_kcfg_files(marblepart_SRCS settings.kcfgc)
 kde4_add_plugin(marble_part WITH_PREFIX ${marblepart_SRCS})
-target_link_libraries(marble_part ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} marbleui marblewidget)
+target_link_libraries(marble_part ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} marbleui ${MARBLEWIDGET})
 
 install(TARGETS marble_part DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES marble_part.desktop DESTINATION ${SERVICES_INSTALL_DIR})
@@ -27,7 +27,7 @@ target_link_libraries (
     ${KDE4_KPARTS_LIBS} 
     ${KDE4_KNEWSTUFF3_LIBS}
     marbleui
-    marblewidget
+    ${MARBLEWIDGET}
     astro
     )
 
diff -up marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt
--- marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/apps/marble-mobile/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -25,7 +25,7 @@ add_definitions(-DMARBLE_MOBILE_VERSION_
 
 marble_qt4_automoc( ${marblemobile_SRCS} )
 add_executable( marble-mobile ${marblemobile_SRCS} )
-target_link_libraries( marble-mobile ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} marbleui marblewidget )
+target_link_libraries( marble-mobile ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} marbleui ${MARBLEWIDGET})
 install( TARGETS marble-mobile RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
 if(APPS_INSTALL_DIR)
   install(PROGRAMS marble-mobile.desktop DESTINATION ${APPS_INSTALL_DIR})
diff -up marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-qt/CMakeLists.txt
--- marble-14.12.1/src/apps/marble-qt/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/apps/marble-qt/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -40,7 +40,7 @@ if (QT4_FOUND)
     ${QT_QTSCRIPT_LIBRARY}
     ${QT_QTMAIN_LIBRARY}
     marbleui
-    marblewidget
+    ${MARBLEWIDGET}
     astro)
 else()
   target_link_libraries (
@@ -53,7 +53,7 @@ else()
     ${Qt5WebKitWidgets_LIBRARIES}
     ${Qt5WebKit_LIBRARIES}
     marbleui
-    marblewidget
+    ${MARBLEWIDGET}
     astro)
 endif()
 
diff -up marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-touch/CMakeLists.txt
--- marble-14.12.1/src/apps/marble-touch/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/apps/marble-touch/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -25,7 +25,7 @@ qt_add_resources(my_SRCS meego.qrc harma
 marble_qt4_automoc( ${my_SRCS} )
 add_executable( marble-touch ${my_SRCS} )
 if (QT4_FOUND)
-  target_link_libraries( marble-touch ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} marblewidget )
+  target_link_libraries( marble-touch ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${MARBLEWIDGET} )
 else() 
   target_link_libraries (
     marble-touch
@@ -34,7 +34,7 @@ else()
     ${Qt5Network_LIBRARIES}
     ${Qt5WebKitWidgets_LIBRARIES}
     ${Qt5WebKit_LIBRARIES}
-    marblewidget)
+    ${MARBLEWIDGET})
 endif()
 install( TARGETS marble-touch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
 if(APPS_INSTALL_DIR)
diff -up marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget marble-14.12.1/src/apps/marble-ui/CMakeLists.txt
--- marble-14.12.1/src/apps/marble-ui/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/apps/marble-ui/CMakeLists.txt	2015-02-23 15:43:12.328429497 -0600
@@ -27,7 +27,7 @@ target_link_libraries (
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSCRIPT_LIBRARY}
   ${QT_QTMAIN_LIBRARY}
-  marblewidget)
+  ${MARBLEWIDGET})
 else()
 target_link_libraries (
     marbleui
@@ -38,7 +38,7 @@ target_link_libraries (
     ${Qt5Network_LIBRARIES}
     ${Qt5WebKitWidgets_LIBRARIES}
     ${Qt5WebKit_LIBRARIES}
-    marblewidget)
+    ${MARBLEWIDGET})
 endif()
 
 if(WIN32)
diff -up marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget marble-14.12.1/src/bindings/python/CMakeLists.txt
--- marble-14.12.1/src/bindings/python/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/bindings/python/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -17,7 +17,7 @@ FILE(GLOB extra_files_sip sip/*.sip)
 set(SIP_EXTRA_FILES_DEPEND ${extra_files_sip})
 
 add_sip_python_module(PyKDE4.marble sip/marblemod.sip
-    marblewidget
+    ${MARBLEWIDGET}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
diff -up marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget marble-14.12.1/src/lib/marble/CMakeLists.txt
--- marble-14.12.1/src/lib/marble/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/lib/marble/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -342,14 +342,14 @@ qt_add_resources(marblewidget_SRCS libma
 qt_wrap_ui(marblewidget_SRCS ${marblewidget_UI})
 marble_qt4_automoc(${marblewidget_SRCS})
 
-ADD_LIBRARY(marblewidget SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
 
 # link with libastro
-TARGET_LINK_LIBRARIES (marblewidget astro)
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
 
 # link with release version of Qt libs
 if( QT4_FOUND )
-  TARGET_LINK_LIBRARIES (marblewidget
+  TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
@@ -362,7 +362,7 @@ if( QT4_FOUND )
     ${QT_QTDECLARATIVE_LIBRARY}
   )
 else()
-  TARGET_LINK_LIBRARIES (marblewidget
+  TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
     ${Qt5Core_LIBRARIES}
     ${Qt5Xml_LIBRARIES}
     ${Qt5Widgets_LIBRARIES}
@@ -376,46 +376,46 @@ endif()
 
 if( PHONON_FOUND AND NOT QT5BUILD )
   INCLUDE_DIRECTORIES( ${PHONON_INCLUDES} )
-  TARGET_LINK_LIBRARIES(marblewidget ${PHONON_LIBS} )
+  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} ${PHONON_LIBS} )
   set (HAVE_PHONON TRUE)
 endif( PHONON_FOUND AND NOT QT5BUILD )
 
 if (APPLE)
   #defined in top level makefile
-  TARGET_LINK_LIBRARIES(marblewidget ${MAC_EXTRA_LIBS} )
+  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} ${MAC_EXTRA_LIBS} )
 endif (APPLE)
 
 if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  TARGET_LINK_LIBRARIES(marblewidget m)
+  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} m)
 endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
 
 if(WIN32)
-  TARGET_LINK_LIBRARIES(marblewidget ws2_32 imm32 winmm)
+  TARGET_LINK_LIBRARIES(${MARBLEWIDGET} ws2_32 imm32 winmm)
 endif(WIN32)
 
 
-set_target_properties(marblewidget  PROPERTIES
+set_target_properties(${MARBLEWIDGET}  PROPERTIES
                                     VERSION ${GENERIC_LIB_VERSION}
                                     SOVERSION ${GENERIC_LIB_SOVERSION}
                                     COMPILE_FLAGS "-DKML_LAZY_IMP")
 # needed for marble_export.h
-set_target_properties(marblewidget PROPERTIES
+set_target_properties(${MARBLEWIDGET} PROPERTIES
   DEFINE_SYMBOL MAKE_MARBLE_LIB
 )
 
 # choose the correct target install library path
 if(WIN32 AND QTONLY)
-  install(TARGETS marblewidget RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(TARGETS ${MARBLEWIDGET} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(WIN32 AND QTONLY)
   if(APPLE AND QTONLY)
-    install (TARGETS marblewidget LIBRARY DESTINATION
+    install (TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION
       ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
 
   else(APPLE AND QTONLY)
     if(QTONLY)
-      install(TARGETS marblewidget LIBRARY DESTINATION ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+      install(TARGETS ${MARBLEWIDGET} LIBRARY DESTINATION ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})
     else(QTONLY)
-        install(TARGETS marblewidget  ${INSTALL_TARGETS_DEFAULT_ARGS})
+        install(TARGETS ${MARBLEWIDGET} ${INSTALL_TARGETS_DEFAULT_ARGS})
     endif(QTONLY)
   endif(APPLE AND QTONLY)
 endif(WIN32 AND QTONLY)
diff -up marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget marble-14.12.1/src/plasmarunner/CMakeLists.txt
--- marble-14.12.1/src/plasmarunner/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/plasmarunner/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -12,7 +12,7 @@ set(plasmaRunner_SRCS
 kde4_add_plugin(plasma_runner_marble ${plasmaRunner_SRCS})
 target_link_libraries(plasma_runner_marble
   ${KDE4_PLASMA_LIBS}
-  marblewidget
+  ${MARBLEWIDGET}
 )
 
 install(TARGETS plasma_runner_marble DESTINATION ${PLUGIN_INSTALL_DIR})
diff -up marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget marble-14.12.1/src/plasmoid/CMakeLists.txt
--- marble-14.12.1/src/plasmoid/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/plasmoid/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -20,7 +20,7 @@ kde4_add_ui_files( worldclock_SRCS world
 kde4_add_plugin(plasma_applet_worldclock ${worldclock_SRCS})
 target_link_libraries(plasma_applet_worldclock
                       ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}
-                      marblewidget )
+                      ${MARBLEWIDGET} )
 
 install(TARGETS plasma_applet_worldclock
         DESTINATION ${PLUGIN_INSTALL_DIR})
diff -up marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt
--- marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/plugins/designer/latloneditwidget/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -12,7 +12,7 @@ ELSE()
   INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
 ENDIF()
 
-#target_link_libraries( marblewidget )
+#target_link_libraries( ${MARBLEWIDGET} )
 
 set( latloneditplugin_SRCS LatLonEditPlugin.cpp )
 
diff -up marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt
--- marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/plugins/runner/gpx/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -72,7 +72,7 @@ if( BUILD_MARBLE_TESTS )
                                      ${QT_QTGUI_LIBRARY}
                                      ${QT_QTTEST_LIBRARY}
                                      ${Qt5Test_LIBRARIES}
-                                     marblewidget )
+                                     ${MARBLEWIDGET} )
     set_target_properties( TestTrack PROPERTIES
                             COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
     add_test( TestTrack TestTrack )
diff -up marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget marble-14.12.1/src/thumbnailer/CMakeLists.txt
--- marble-14.12.1/src/thumbnailer/CMakeLists.txt.marblewidget	2015-01-01 11:29:24.000000000 -0600
+++ marble-14.12.1/src/thumbnailer/CMakeLists.txt	2015-02-23 15:43:12.329429499 -0600
@@ -10,7 +10,7 @@ set(marblethumbnail_SRCS
 )
 kde4_add_plugin(marblethumbnail ${marblethumbnail_SRCS})
 target_link_libraries(marblethumbnail
-  marblewidget
+  ${MARBLEWIDGET} 
   ${KDE4_KIO_LIBS}
 )
 install(TARGETS marblethumbnail  DESTINATION ${PLUGIN_INSTALL_DIR})

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional