File make_astro_coinstall.diff of Package marble.openSUSE_Leap_42.1_Update
diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt
--- marble-15.08.2/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -121,6 +121,7 @@
cmake_minimum_required(VERSION 2.8.12)
set(QT4BUILD FALSE)
set(MARBLEWIDGET marblewidget-qt5)
+ set(ASTRO astro-qt5)
include_directories( ${Qt5Svg_INCLUDE_DIRS} )
include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
@@ -135,6 +136,7 @@
set(WITH_KF5 FALSE)
set(QT4BUILD TRUE)
set(MARBLEWIDGET marblewidget)
+ set(ASTRO astro)
find_package(Qt4 REQUIRED)
set( QT_USE_QTXML ON )
set( QT_USE_QTNETWORK ON )
diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -54,7 +54,7 @@
marble
marbleui
${MARBLEWIDGET}
- astro
+ ${ASTRO}
KF5::NewStuff
KF5::Wallet
KF5::Parts
diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt
--- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/apps/marble_maps/CMakeLists.txt 2015-10-11 18:06:50.981995015 +0200
@@ -14,7 +14,7 @@
${Qt5WebKitWidgets_LIBRARIES}
${Qt5WebKit_LIBRARIES}
${MARBLEWIDGET}
- astro)
+ ${ASTRO})
file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets")
file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
@@ -32,7 +32,7 @@
PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package"
PACKAGE_NAME org.kde.marble.maps
${KEYSTORE_OPTIONS}
- DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so"
+ DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so"
)
# Move target from default build to install phase so we can create everything in one go
diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -40,7 +40,7 @@
${QT_QTDBUS_LIBRARY}
marbleui
${MARBLEWIDGET}
- astro)
+ ${ASTRO})
else()
target_link_libraries (
marble-qt
@@ -53,7 +53,7 @@
${Qt5WebKit_LIBRARIES}
marbleui
${MARBLEWIDGET}
- astro)
+ ${ASTRO})
endif()
if(WIN32)
diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble-15.08.2/src/lib/astro/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/lib/astro/CMakeLists.txt 2015-10-11 18:08:05.239677950 +0200
@@ -20,23 +20,23 @@
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
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h
@@ -44,11 +44,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 -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble-15.08.2/src/lib/marble/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/lib/marble/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -372,7 +372,7 @@
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( QT4BUILD )
diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -26,4 +26,4 @@
marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
-target_link_libraries( EclipsesPlugin astro )
+target_link_libraries( EclipsesPlugin ${ASTRO} )
diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-11 18:08:39.680458497 +0200
@@ -37,4 +37,4 @@
${satellites_SRCS}
${sgp4_SRCS} )
-target_link_libraries( SatellitesPlugin astro )
+target_link_libraries( SatellitesPlugin ${ASTRO} )
diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -16,4 +16,4 @@
qt_wrap_ui(stars_SRCS ${stars_UI})
marble_add_plugin( StarsPlugin ${stars_SRCS} )
-target_link_libraries( StarsPlugin astro )
+target_link_libraries( StarsPlugin ${ASTRO} )
diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
--- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200
+++ new/tools/osm-sisyphus/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200
@@ -24,7 +24,7 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
if(QT4BUILD)
- target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} marblewidget )
+ target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} ${MARBLEWIDGET} )
else()
- target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 )
+ target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} ${MARBLEWIDGET} )
endif()
