File make_astro_coinstall.diff of Package marble

Overview Repositories Revisions Requests Users Attributes Meta

File make_astro_coinstall.diff of Package marble (Revision 28d340f7a5855decbaa623a2fb58ceff)

Currently displaying revision 28d340f7a5855decbaa623a2fb58ceff , Show latest

diff -urNB marble/CMakeLists.txt new/CMakeLists.txt
--- marble/CMakeLists.txt	2016-04-02 08:57:40.301310654 +0200
+++ new/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -94,6 +94,7 @@
 
 cmake_minimum_required(VERSION 2.8.12)
 set(MARBLEWIDGET marblewidget-qt5)
+set(ASTRO astro-qt5)
 
 include_directories( ${Qt5Svg_INCLUDE_DIRS} )
 include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
diff -urNB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
--- marble/src/apps/behaim/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/behaim/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -29,7 +29,7 @@
       ${Qt5Positioning_LIBRARIES}
       ${Qt5AndroidExtras_LIBRARIES}
       ${Qt5Multimedia_LIBRARIES}
-      astro
+      ${ASTRO}
       ${MARBLEWIDGET}
       marbledeclarative)
 
@@ -47,7 +47,7 @@
     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so")
-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim")
     set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel")
diff -urNB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble/src/apps/marble-kde/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -53,7 +53,7 @@
     marble
     marbleui
     ${MARBLEWIDGET}
-    astro
+    ${ASTRO}
     KF5::NewStuff
     KF5::Parts
     KF5::Crash
diff -urNB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
--- marble/src/apps/marble-maps/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-maps/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -29,7 +29,7 @@
       ${Qt5Positioning_LIBRARIES}
       ${Qt5AndroidExtras_LIBRARIES}
       ${Qt5Multimedia_LIBRARIES}
-      astro
+      ${ASTRO}
       ${MARBLEWIDGET}
       marbledeclarative)
 
@@ -47,7 +47,7 @@
     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
     set(QT_ANDROID_APP_NAME "Marble Maps")
diff -urNB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble/src/apps/marble-qt/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -34,7 +34,7 @@
 ${Qt5WebKit_LIBRARIES}
 marbleui
 ${MARBLEWIDGET}
-astro)
+${ASTRO})
 
 if(WIN32)
   target_link_libraries(
diff -urNB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble/src/lib/astro/CMakeLists.txt	2016-04-02 08:57:40.633305144 +0200
+++ new/src/lib/astro/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -21,27 +21,27 @@
   solarsystem.cpp
 )
 
-ADD_LIBRARY(astro SHARED ${astrolib_SRCS})
+ADD_LIBRARY(${ASTRO} SHARED ${astrolib_SRCS})
 
 if (APPLE)
   #defined in top level makefile
-  TARGET_LINK_LIBRARIES(astro ${MAC_EXTRA_LIBS})
+  TARGET_LINK_LIBRARIES(${ASTRO} ${MAC_EXTRA_LIBS})
 endif (APPLE)
 
 if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  TARGET_LINK_LIBRARIES(astro m)
+  TARGET_LINK_LIBRARIES(${ASTRO} m)
 endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
 
 if(WIN32)
-  TARGET_LINK_LIBRARIES(astro ws2_32 imm32 winmm)
+  TARGET_LINK_LIBRARIES(${ASTRO} ws2_32 imm32 winmm)
 endif(WIN32)
 
 
-SET_TARGET_PROPERTIES(astro PROPERTIES
+SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
     DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
   )
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
-  SET_TARGET_PROPERTIES(astro PROPERTIES
+  SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
   )
@@ -49,11 +49,11 @@
 
 # choose the correct target install library path
 if(WIN32)
-  INSTALL(TARGETS astro RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+  INSTALL(TARGETS ${ASTRO} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 elseif(APPLE)
-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
 else()
-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 ########### install files ###############
diff -urNB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble/src/lib/marble/CMakeLists.txt	2016-04-02 08:57:40.637305078 +0200
+++ new/src/lib/marble/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
@@ -361,7 +361,7 @@
 ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
 
 # link with libastro
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
 
 # link against zlib
 TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
diff -urNB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble/src/plugins/render/eclipses/CMakeLists.txt	2016-04-02 08:57:40.693304148 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt	2016-04-02 08:57:58.369012904 +0200
@@ -22,4 +22,4 @@
 
 marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
 
-target_link_libraries( EclipsesPlugin astro )
+target_link_libraries( EclipsesPlugin ${ASTRO} )
diff -urNB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble/src/plugins/render/satellites/CMakeLists.txt	2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt	2016-04-02 08:57:58.369012904 +0200
@@ -30,4 +30,4 @@
  ${satellites_SRCS}
  ${sgp4_SRCS} )
 
-target_link_libraries( SatellitesPlugin astro sgp4 )
+target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
diff -urNB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble/src/plugins/render/stars/CMakeLists.txt	2016-04-02 08:57:40.701304015 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt	2016-04-02 08:57:58.369012904 +0200
@@ -13,4 +13,4 @@
 qt_wrap_ui(stars_SRCS  ${stars_UI})
 
 marble_add_plugin( StarsPlugin ${stars_SRCS} )
-target_link_libraries( StarsPlugin astro )
+target_link_libraries( StarsPlugin ${ASTRO} )

Places

File make_astro_coinstall.diff of Package marble (Revision 28d340f7a5855decbaa623a2fb58ceff)

Places