CMakeLists.txt   CMakeLists.txt 
skipping to change at line 26 skipping to change at line 26
core/StelVideoMgr.cpp core/StelVideoMgr.cpp
core/StelGeodesicGrid.cpp core/StelGeodesicGrid.cpp
core/StelGeodesicGrid.hpp core/StelGeodesicGrid.hpp
core/StelMovementMgr.cpp core/StelMovementMgr.cpp
core/StelMovementMgr.hpp core/StelMovementMgr.hpp
core/StelObserver.cpp core/StelObserver.cpp
core/StelObserver.hpp core/StelObserver.hpp
core/StelLocation.hpp core/StelLocation.hpp
core/StelLocation.cpp core/StelLocation.cpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelLocationMgr_p.hpp
core/StelLocationMgr.cpp core/StelLocationMgr.cpp
core/StelProjector.cpp core/StelProjector.cpp
core/StelProjector.hpp core/StelProjector.hpp
core/StelProjectorClasses.cpp core/StelProjectorClasses.cpp
core/StelProjectorClasses.hpp core/StelProjectorClasses.hpp
core/StelProjectorType.hpp core/StelProjectorType.hpp
core/StelSkyDrawer.cpp core/StelSkyDrawer.cpp
core/StelSkyDrawer.hpp core/StelSkyDrawer.hpp
core/StelPainter.hpp core/StelPainter.hpp
core/StelPainter.cpp core/StelPainter.cpp
skipping to change at line 117 skipping to change at line 118
core/RefractionExtinction.cpp core/RefractionExtinction.cpp
core/StelToast.hpp core/StelToast.hpp
core/StelToast.cpp core/StelToast.cpp
core/StelToastGrid.hpp core/StelToastGrid.hpp
core/StelToastGrid.cpp core/StelToastGrid.cpp
core/StelActionMgr.hpp core/StelActionMgr.hpp
core/StelActionMgr.cpp core/StelActionMgr.cpp
core/StelProgressController.hpp core/StelProgressController.hpp
core/StelPropertyMgr.hpp core/StelPropertyMgr.hpp
core/StelPropertyMgr.cpp core/StelPropertyMgr.cpp
core/StelOBJ.hpp
core/StelOBJ.cpp
core/GeomMath.hpp
core/GeomMath.cpp
core/StelOpenGLArray.hpp
core/StelOpenGLArray.cpp
${spout_SRCS} ${spout_SRCS}
core/planetsephems/calc_interpolated_elements.c core/planetsephems/calc_interpolated_elements.c
core/planetsephems/calc_interpolated_elements.h core/planetsephems/calc_interpolated_elements.h
core/planetsephems/elliptic_to_rectangular.c core/planetsephems/elliptic_to_rectangular.c
core/planetsephems/elliptic_to_rectangular.h core/planetsephems/elliptic_to_rectangular.h
core/planetsephems/elp82b.c core/planetsephems/elp82b.c
core/planetsephems/elp82b.h core/planetsephems/elp82b.h
core/planetsephems/gust86.c core/planetsephems/gust86.c
skipping to change at line 157 skipping to change at line 164
core/planetsephems/tass17.h core/planetsephems/tass17.h
core/planetsephems/vsop87.c core/planetsephems/vsop87.c
core/planetsephems/vsop87.h core/planetsephems/vsop87.h
core/planetsephems/de430.cpp core/planetsephems/de430.cpp
core/planetsephems/de430.hpp core/planetsephems/de430.hpp
core/planetsephems/de431.cpp core/planetsephems/de431.cpp
core/planetsephems/de431.hpp core/planetsephems/de431.hpp
core/modules/Atmosphere.cpp core/modules/Atmosphere.cpp
core/modules/Atmosphere.hpp core/modules/Atmosphere.hpp
core/modules/Asterism.cpp
core/modules/Asterism.hpp
core/modules/AsterismMgr.cpp
core/modules/AsterismMgr.hpp
core/modules/Constellation.cpp core/modules/Constellation.cpp
core/modules/Constellation.hpp core/modules/Constellation.hpp
core/modules/ConstellationMgr.cpp core/modules/ConstellationMgr.cpp
core/modules/ConstellationMgr.hpp core/modules/ConstellationMgr.hpp
core/modules/CustomObject.cpp core/modules/CustomObject.cpp
core/modules/CustomObject.hpp core/modules/CustomObject.hpp
core/modules/CustomObjectMgr.cpp core/modules/CustomObjectMgr.cpp
core/modules/CustomObjectMgr.hpp core/modules/CustomObjectMgr.hpp
core/modules/GridLinesMgr.cpp core/modules/GridLinesMgr.cpp
core/modules/GridLinesMgr.hpp core/modules/GridLinesMgr.hpp
skipping to change at line 393 skipping to change at line 404
# WinSock library # WinSock library
IF(WIN32) IF(WIN32)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGI NS_LIBRARIES} ws2_32) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGI NS_LIBRARIES} ws2_32)
ENDIF() ENDIF()
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
################################ Build main program ####################### ################## ################################ Build main program ####################### ##################
########################################################################### ################## ########################################################################### ##################
IF(WIN32 AND NOT MSVC) IF(WIN32)
# This library is required on MinGW builds for some native methods used # This library is required for some native methods used in a fix in mai
in a fix in main.cpp n.cpp
SET(winMMLib libwinmm.a) SET(winMMLib winmm)
ENDIF() ENDIF()
IF(WIN32 AND ENABLE_WINDOWS_EXE_ICON) IF(WIN32 AND ENABLE_WINDOWS_EXE_ICON)
IF(RC_COMPILER_PATH) IF(RC_COMPILER_PATH)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o
COMMAND ${RC_COMPILER_PATH} ${CMAKE_BINARY_DIR}/stellarium.r c ${CMAKE_BINARY_DIR}/stellarium-rc.o) COMMAND ${RC_COMPILER_PATH} ${CMAKE_BINARY_DIR}/stellarium.r c ${CMAKE_BINARY_DIR}/stellarium-rc.o)
SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINARY_DIR }/stellarium-rc.o) SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINARY_DIR }/stellarium-rc.o)
ELSE() ELSE()
IF(MSVC) IF(MSVC)
skipping to change at line 419 skipping to change at line 430
ENDIF() ENDIF()
# Setup Qt5 dependencies # Setup Qt5 dependencies
SET(STELLARIUM_QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Gui ${STEL_GLES_ LIBS} Qt5::Network Qt5::Widgets) SET(STELLARIUM_QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Gui ${STEL_GLES_ LIBS} Qt5::Network Qt5::Widgets)
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Multimedia Qt5::MultimediaWidgets) SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Multimedia Qt5::MultimediaWidgets)
ENDIF() ENDIF()
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Script) SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Script)
ENDIF() ENDIF()
if(USE_OLD_QGLWIDGET) IF(USE_OLD_QGLWIDGET)
# The Qt5OpenGL library is only required when using the legacy viewpor t # The Qt5OpenGL library is only required when using the legacy viewpor t
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::OpenGL) SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::OpenGL)
endif() ENDIF()
IF(ENABLE_GPS)
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Positionin
g Qt5::SerialPort)
ENDIF()
if(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL) IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
# automatically copy the spout .dll to the binary directory, if possib le # automatically copy the spout .dll to the binary directory, if possib le
CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYON LY) CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYON LY)
endif() ENDIF()
set(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_ SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_
stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SP stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SP
OUT_LIBRARY}) OUT_LIBRARY})
IF(ENABLE_LIBGPS)
SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
ENDIF()
# Main executable/library setup # Main executable/library setup
IF(GENERATE_STELMAINLIB) IF(GENERATE_STELMAINLIB)
ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_RES_CX X}) ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_RES_CX X})
TARGET_LINK_LIBRARIES(stelMain ${STELMAIN_DEPS}) TARGET_LINK_LIBRARIES(stelMain ${STELMAIN_DEPS})
INSTALL(TARGETS stelMain DESTINATION lib) INSTALL(TARGETS stelMain DESTINATION lib)
ADD_EXECUTABLE(stellarium ${stellarium_exe_SRCS}) # WIN32 creates a windows app without console, no effect on non-win pl
atforms
ADD_EXECUTABLE(stellarium WIN32 ${stellarium_exe_SRCS})
#stelMain should be after the plug-ins, otherwise the build crashes #stelMain should be after the plug-ins, otherwise the build crashes
TARGET_LINK_LIBRARIES(stellarium stelMain ${winMMLib}) TARGET_LINK_LIBRARIES(stellarium stelMain ${winMMLib})
ELSE() ELSE()
ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_RES_CXX} ${stellarium_exe_SRCS}) ADD_EXECUTABLE(stellarium WIN32 ${stellarium_lib_SRCS} ${stellarium_RE S_CXX} ${stellarium_exe_SRCS})
TARGET_LINK_LIBRARIES(stellarium ${winMMLib} ${STELMAIN_DEPS}) TARGET_LINK_LIBRARIES(stellarium ${winMMLib} ${STELMAIN_DEPS})
IF(APPLE) IF(APPLE)
SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framewo rk Cocoa -framework OpenGL") SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framewo rk Cocoa -framework OpenGL")
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_DEPENDENCIES(stellarium AllStaticPlugins) ADD_DEPENDENCIES(stellarium AllStaticPlugins)
# Adding manifest # Adding manifest
 End of changes. 11 change blocks. 
13 lines changed or deleted 33 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/