CMakeLists.txt   CMakeLists.txt 
skipping to change at line 114 skipping to change at line 114
core/StelObject.cpp core/StelObject.cpp
core/StelObject.hpp core/StelObject.hpp
core/StelObjectMgr.cpp core/StelObjectMgr.cpp
core/StelObjectMgr.hpp core/StelObjectMgr.hpp
core/StelObjectModule.cpp core/StelObjectModule.cpp
core/StelObjectModule.hpp core/StelObjectModule.hpp
core/StelObjectType.hpp core/StelObjectType.hpp
core/StelOpenGL.cpp core/StelOpenGL.cpp
core/StelOpenGL.hpp core/StelOpenGL.hpp
core/StelPluginInterface.hpp core/StelPluginInterface.hpp
core/StelRegionObject.hpp
core/StelSkyCultureMgr.cpp core/StelSkyCultureMgr.cpp
core/StelSkyCultureMgr.hpp core/StelSkyCultureMgr.hpp
core/StelTextureMgr.cpp core/StelTextureMgr.cpp
core/StelTextureMgr.hpp core/StelTextureMgr.hpp
core/StelTexture.cpp core/StelTexture.cpp
core/StelTexture.hpp core/StelTexture.hpp
core/StelTextureTypes.hpp core/StelTextureTypes.hpp
core/StelToneReproducer.cpp core/StelToneReproducer.cpp
core/StelToneReproducer.hpp core/StelToneReproducer.hpp
core/StelSkyLayerMgr.cpp core/StelSkyLayerMgr.cpp
skipping to change at line 158 skipping to change at line 159
core/StelGuiBase.cpp core/StelGuiBase.cpp
core/StelViewportEffect.hpp core/StelViewportEffect.hpp
core/StelViewportEffect.cpp core/StelViewportEffect.cpp
core/TrailGroup.hpp core/TrailGroup.hpp
core/TrailGroup.cpp core/TrailGroup.cpp
core/RefractionExtinction.hpp core/RefractionExtinction.hpp
core/RefractionExtinction.cpp core/RefractionExtinction.cpp
core/StelActionMgr.hpp core/StelActionMgr.hpp
core/StelActionMgr.cpp core/StelActionMgr.cpp
core/StelProgressController.hpp core/StelProgressController.hpp
core/StelPropertyMgr.hpp
core/StelPropertyMgr.cpp
${gl_lib_SRCS} ${gl_lib_SRCS}
${glues_lib_SRCS} ${glues_lib_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
skipping to change at line 181 skipping to change at line 184
core/planetsephems/l1.c core/planetsephems/l1.c
core/planetsephems/l1.h core/planetsephems/l1.h
core/planetsephems/marssat.c core/planetsephems/marssat.c
core/planetsephems/marssat.h core/planetsephems/marssat.h
core/planetsephems/pluto.c core/planetsephems/pluto.c
core/planetsephems/pluto.h core/planetsephems/pluto.h
core/planetsephems/precession.c core/planetsephems/precession.c
core/planetsephems/precession.h core/planetsephems/precession.h
core/planetsephems/sidereal_time.c core/planetsephems/sidereal_time.c
core/planetsephems/sidereal_time.h core/planetsephems/sidereal_time.h
core/planetsephems/stellplanet.c #core/planetsephems/stellplanet.c # replaced by EphemWrapper during
core/planetsephems/stellplanet.h de430 work
#core/planetsephems/stellplanet.h
core/planetsephems/jpl_int.h
core/planetsephems/jpleph.h
core/planetsephems/jpleph.cpp
core/planetsephems/EphemWrapper.cpp
core/planetsephems/EphemWrapper.hpp
core/planetsephems/tass17.c core/planetsephems/tass17.c
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.hpp
core/planetsephems/de431.cpp
core/planetsephems/de431.hpp
core/modules/Atmosphere.cpp core/modules/Atmosphere.cpp
core/modules/Atmosphere.hpp core/modules/Atmosphere.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/GridLinesMgr.cpp core/modules/GridLinesMgr.cpp
core/modules/GridLinesMgr.hpp core/modules/GridLinesMgr.hpp
core/modules/LabelMgr.hpp core/modules/LabelMgr.hpp
skipping to change at line 249 skipping to change at line 262
core/modules/ZoneData.hpp core/modules/ZoneData.hpp
StelMainView.hpp StelMainView.hpp
StelMainView.cpp StelMainView.cpp
StelLogger.hpp StelLogger.hpp
StelLogger.cpp StelLogger.cpp
CLIProcessor.hpp CLIProcessor.hpp
CLIProcessor.cpp CLIProcessor.cpp
translations.h translations.h
) )
### CMake < 3.0 does not AUTOMOC Q_GADGET which some files use, so we have
to manually add it
### Wrap it in an IF to prevent some linker warnings about symbols defined
twice (on MSVC13 at least)
### Q_GADGET is required force the Qt MOC to run on some specific files,
### because they do not contain QObjects, but require a MOC for Q_FLAGS or
similar
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)
QT5_WRAP_CPP(stellarium_lib_moc_SRCS
core/StelObject.hpp
core/StelRegionObject.hpp
core/modules/Nebula.hpp
)
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
${stellarium_lib_moc_SRCS}
)
ENDIF()
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
core/external/qtcompress/qzip.cpp core/external/qtcompress/qzip.cpp
core/external/qtcompress/qzipreader.h core/external/qtcompress/qzipreader.h
core/external/qtcompress/qzipwriter.h core/external/qtcompress/qzipwriter.h
core/external/qcustomplot/qcustomplot.cpp
core/external/qcustomplot/qcustomplot.h
) )
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
scripting/StelScriptOutput.hpp scripting/StelScriptOutput.hpp
scripting/StelScriptOutput.cpp scripting/StelScriptOutput.cpp
scripting/StelScriptMgr.cpp scripting/StelScriptMgr.cpp
scripting/StelScriptMgr.hpp scripting/StelScriptMgr.hpp
scripting/ScreenImageMgr.hpp scripting/ScreenImageMgr.hpp
scripting/ScreenImageMgr.cpp scripting/ScreenImageMgr.cpp
skipping to change at line 320 skipping to change at line 350
gui/ViewDialog.hpp gui/ViewDialog.hpp
gui/ViewDialog.cpp gui/ViewDialog.cpp
gui/SearchDialog.hpp gui/SearchDialog.hpp
gui/SearchDialog.cpp gui/SearchDialog.cpp
gui/ConfigurationDialog.hpp gui/ConfigurationDialog.hpp
gui/ConfigurationDialog.cpp gui/ConfigurationDialog.cpp
gui/AddRemoveLandscapesDialog.hpp gui/AddRemoveLandscapesDialog.hpp
gui/AddRemoveLandscapesDialog.cpp gui/AddRemoveLandscapesDialog.cpp
gui/AtmosphereDialog.hpp gui/AtmosphereDialog.hpp
gui/AtmosphereDialog.cpp gui/AtmosphereDialog.cpp
gui/GreatRedSpotDialog.hpp
gui/GreatRedSpotDialog.cpp
gui/CustomDeltaTEquationDialog.hpp gui/CustomDeltaTEquationDialog.hpp
gui/CustomDeltaTEquationDialog.cpp gui/CustomDeltaTEquationDialog.cpp
gui/AstroCalcDialog.hpp gui/AstroCalcDialog.hpp
gui/AstroCalcDialog.cpp gui/AstroCalcDialog.cpp
gui/BookmarksDialog.hpp
gui/BookmarksDialog.cpp
gui/StelDialog.hpp gui/StelDialog.hpp
gui/StelDialog_p.hpp
gui/StelDialog.cpp gui/StelDialog.cpp
) )
################# compiles .ui files ############ ################# compiles .ui files ############
SET(stellarium_UIS SET(stellarium_UIS
gui/locationDialogGui.ui gui/locationDialogGui.ui
gui/helpDialogGui.ui gui/helpDialogGui.ui
gui/shortcutsDialog.ui gui/shortcutsDialog.ui
gui/dateTimeDialogGui.ui gui/dateTimeDialogGui.ui
gui/viewDialog.ui gui/viewDialog.ui
gui/searchDialogGui.ui gui/searchDialogGui.ui
gui/configurationDialog.ui gui/configurationDialog.ui
gui/atmosphereDialog.ui gui/atmosphereDialog.ui
gui/greatRedSpotDialog.ui
gui/customDeltaTEquationDialog.ui gui/customDeltaTEquationDialog.ui
gui/astroCalcDialog.ui gui/astroCalcDialog.ui
gui/bookmarksDialog.ui
gui/addRemoveLandscapesDialog.ui gui/addRemoveLandscapesDialog.ui
) )
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
IF(ENABLE_SCRIPT_CONSOLE) IF(ENABLE_SCRIPT_CONSOLE)
SET(stellarium_gui_SRCS ${stellarium_gui_SRCS} SET(stellarium_gui_SRCS ${stellarium_gui_SRCS}
gui/ScriptConsole.hpp gui/ScriptConsole.hpp
gui/ScriptConsole.cpp gui/ScriptConsole.cpp
gui/StelScriptSyntaxHighlighter.hpp gui/StelScriptSyntaxHighlighter.hpp
gui/StelScriptSyntaxHighlighter.cpp gui/StelScriptSyntaxHighlighter.cpp
skipping to change at line 405 skipping to change at line 442
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 ####################### ##################
########################################################################### ################## ########################################################################### ##################
SET(extLinkerOption ${extLinkerOption} ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES }) SET(extLinkerOption ${extLinkerOption} ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES })
IF(ENABLE_MEDIA)
# Forced linkage to Qt5MultimediaWidgets library when media support is
enabled
SET(extLinkerOption ${extLinkerOption} ${Qt5MultimediaWidgets_LIBRARIES
})
ENDIF()
IF(WIN32 AND NOT MSVC) IF(WIN32 AND NOT MSVC)
# TODO: Test if winsock is still necessary if the Telescope Control plug-in is disabled. # TODO: Test if winsock is still necessary if the Telescope Control plug-in is disabled.
# Because including it here seems to duplicate STELLARIUM_STATIC_PLUGINS_LI BRARIES # Because including it here seems to duplicate STELLARIUM_STATIC_PLUGINS_LI BRARIES
SET(extLinkerOption ${extLinkerOption} libwinmm.a -lws2_32) SET(extLinkerOption ${extLinkerOption} libwinmm.a -lws2_32)
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(OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o ADD_CUSTOM_COMMAND(
COMMAND ${RC_COMPILER_PATH} ${CMAKE_SOURCE_DIR}/data/st OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o
ellarium.rc ${CMAKE_BINARY_DIR}/stellarium-rc.o COMMAND ${RC_COMPILER_PATH} ${CMAKE_BINARY_DIR}/stellarium.r
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data) 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)
SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_SOURC E_DIR}/data/stellarium.rc) SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINAR Y_DIR}/stellarium.rc)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
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 ${extLinkerOption} ${STELLARIUM_STATIC_ PLUGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stelMain ${extLinkerOption} ${STELLARIUM_STATIC_ PLUGINS_LIBRARIES})
QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Script Wid QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Script Wid
gets) gets PrintSupport)
IF(ENABLE_SOUND) IF(ENABLE_MEDIA)
QT5_USE_MODULES(stelMain Multimedia) QT5_USE_MODULES(stelMain Multimedia MultimediaWidgets)
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stelMain SerialPort) QT5_USE_MODULES(stelMain SerialPort)
ENDIF() ENDIF()
INSTALL(TARGETS stelMain DESTINATION lib) INSTALL(TARGETS stelMain DESTINATION lib)
ADD_EXECUTABLE(stellarium ${stellarium_exe_SRCS}) ADD_EXECUTABLE(stellarium ${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 ${STELLARIUM_STATIC_PLUGINS_LIBRARIES } stelMain ${extLinkerOption}) TARGET_LINK_LIBRARIES(stellarium ${STELLARIUM_STATIC_PLUGINS_LIBRARIES } stelMain ${extLinkerOption})
ELSE() ELSE()
ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_RES_CXX} ${stellarium_exe_SRCS}) ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_RES_CXX} ${stellarium_exe_SRCS})
TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATI C_PLUGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATI C_PLUGINS_LIBRARIES})
# This will add the ANGLE lib if the Qt version supports it. # This will add the ANGLE lib if the Qt version supports it.
TARGET_LINK_LIBRARIES(stellarium ${Qt5Gui_LIBRARIES} ${Qt5Gui_OPENGL_L IBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${Qt5Gui_LIBRARIES} ${Qt5Gui_OPENGL_L IBRARIES})
QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Script W QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Script W
idgets) idgets PrintSupport)
IF(ENABLE_SOUND) IF(ENABLE_MEDIA)
QT5_USE_MODULES(stellarium Multimedia) QT5_USE_MODULES(stellarium Multimedia MultimediaWidgets)
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stellarium SerialPort) QT5_USE_MODULES(stellarium SerialPort)
ENDIF() ENDIF()
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
IF(MSVC) IF(MSVC)
ADD_CUSTOM_COMMAND(TARGET stellarium ADD_CUSTOM_COMMAND(TARGET stellarium
POST_BUILD POST_BUILD
COMMAND "mt.exe" -nologo -manifest ${CMAKE_SOURCE_DIR}/stellarium .exe.manifest -outputresource:$<TARGET_FILE:stellarium> COMMAND "mt.exe" -nologo -manifest ${PROJECT_SOURCE_DIR}/data/ste llarium.exe.manifest -outputresource:$<TARGET_FILE:stellarium>
COMMENT "Adding manifest..." COMMENT "Adding manifest..."
VERBATIM VERBATIM
) )
ENDIF(MSVC) ENDIF(MSVC)
INSTALL(TARGETS stellarium DESTINATION bin) INSTALL(TARGETS stellarium DESTINATION bin)
########################################################################### ################## ########################################################################### ##################
################################## Build unit tests ####################### ################## ################################## Build unit tests ####################### ##################
########################################################################### ################## ########################################################################### ##################
 End of changes. 17 change blocks. 
16 lines changed or deleted 63 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/