CMakeLists.txt   CMakeLists.txt 
skipping to change at line 60 skipping to change at line 60
core/external/zlib/inftrees.h core/external/zlib/inftrees.h
core/external/zlib/trees.c core/external/zlib/trees.c
core/external/zlib/trees.h core/external/zlib/trees.h
core/external/zlib/uncompr.c core/external/zlib/uncompr.c
core/external/zlib/zconf.h core/external/zlib/zconf.h
core/external/zlib/zlib.h core/external/zlib/zlib.h
core/external/zlib/zutil.c core/external/zlib/zutil.c
core/external/zlib/zutil.h core/external/zlib/zutil.h
) )
IF(ENABLE_SPOUT)
SET(spout_SRCS
core/external/SpoutLibrary.h
core/SpoutSender.hpp
core/SpoutSender.cpp
)
ENDIF()
SET(stellarium_lib_SRCS SET(stellarium_lib_SRCS
core/StelAudioMgr.hpp core/StelAudioMgr.hpp
core/StelAudioMgr.cpp core/StelAudioMgr.cpp
core/StelVideoMgr.hpp core/StelVideoMgr.hpp
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
skipping to change at line 156 skipping to change at line 164
core/StelVertexArray.hpp core/StelVertexArray.hpp
core/StelVertexArray.cpp core/StelVertexArray.cpp
core/StelGuiBase.hpp core/StelGuiBase.hpp
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/StelToast.hpp
core/StelToast.cpp
core/StelToastGrid.hpp
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
${gl_lib_SRCS} ${gl_lib_SRCS}
${glues_lib_SRCS} ${glues_lib_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
core/planetsephems/gust86.h core/planetsephems/gust86.h
core/planetsephems/l1.c core/planetsephems/l1.c
core/planetsephems/l1.h core/planetsephems/l1.h
skipping to change at line 207 skipping to change at line 221
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/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.hpp
core/modules/CustomObjectMgr.cpp
core/modules/CustomObjectMgr.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
core/modules/LabelMgr.cpp core/modules/LabelMgr.cpp
core/modules/Landscape.cpp core/modules/Landscape.cpp
core/modules/Landscape.hpp core/modules/Landscape.hpp
core/modules/LandscapeMgr.cpp core/modules/LandscapeMgr.cpp
core/modules/LandscapeMgr.hpp core/modules/LandscapeMgr.hpp
core/modules/Meteor.cpp core/modules/Meteor.cpp
core/modules/Meteor.hpp core/modules/Meteor.hpp
skipping to change at line 248 skipping to change at line 266
core/modules/Skylight.hpp core/modules/Skylight.hpp
core/modules/SolarSystem.cpp core/modules/SolarSystem.cpp
core/modules/SolarSystem.hpp core/modules/SolarSystem.hpp
core/modules/Solve.hpp core/modules/Solve.hpp
core/modules/Star.cpp core/modules/Star.cpp
core/modules/Star.hpp core/modules/Star.hpp
core/modules/StarMgr.cpp core/modules/StarMgr.cpp
core/modules/StarMgr.hpp core/modules/StarMgr.hpp
core/modules/StarWrapper.cpp core/modules/StarWrapper.cpp
core/modules/StarWrapper.hpp core/modules/StarWrapper.hpp
core/modules/ToastMgr.hpp
core/modules/ToastMgr.cpp
core/modules/ZoneArray.cpp core/modules/ZoneArray.cpp
core/modules/ZodiacalLight.hpp core/modules/ZodiacalLight.hpp
core/modules/ZodiacalLight.cpp core/modules/ZodiacalLight.cpp
core/modules/ZoneArray.hpp core/modules/ZoneArray.hpp
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
translations_countries.h
) )
### CMake < 3.0 does not AUTOMOC Q_GADGET which some files use, so we have to manually add it ### 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) ### 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, ### 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 ### 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) IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)
QT5_WRAP_CPP(stellarium_lib_moc_SRCS QT5_WRAP_CPP(stellarium_lib_moc_SRCS
core/StelObject.hpp core/StelObject.hpp
core/StelRegionObject.hpp core/StelRegionObject.hpp
skipping to change at line 350 skipping to change at line 371
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/ConfigureDSOColorsDialog.hpp
gui/ConfigureDSOColorsDialog.cpp
gui/ConfigureOrbitColorsDialog.hpp
gui/ConfigureOrbitColorsDialog.cpp
gui/GreatRedSpotDialog.hpp gui/GreatRedSpotDialog.hpp
gui/GreatRedSpotDialog.cpp 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.hpp
gui/BookmarksDialog.cpp gui/BookmarksDialog.cpp
gui/StelDialog.hpp gui/StelDialog.hpp
gui/StelDialog_p.hpp gui/StelDialog_p.hpp
skipping to change at line 378 skipping to change at line 403
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/greatRedSpotDialog.ui
gui/customDeltaTEquationDialog.ui gui/customDeltaTEquationDialog.ui
gui/astroCalcDialog.ui gui/astroCalcDialog.ui
gui/bookmarksDialog.ui gui/bookmarksDialog.ui
gui/addRemoveLandscapesDialog.ui gui/addRemoveLandscapesDialog.ui
gui/dsoColorsDialog.ui
gui/orbitColorsDialog.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 465 skipping to change at line 492
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)
SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINAR Y_DIR}/stellarium.rc) SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINAR Y_DIR}/stellarium.rc)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
if(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
# automatically copy the spout .dll to the binary directory, if possibl
e
configure_file(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONL
Y)
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 gets PrintSupport) QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Widgets Pr intSupport)
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
QT5_USE_MODULES(stelMain Multimedia MultimediaWidgets) QT5_USE_MODULES(stelMain Multimedia MultimediaWidgets)
ENDIF()
IF(ENABLE_SCRIPTING)
QT5_USE_MODULES(stelMain Script)
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stelMain SerialPort) QT5_USE_MODULES(stelMain SerialPort)
ENDIF() ENDIF()
IF(ENABLE_SPOUT)
TARGET_LINK_LIBRARIES(stelMain ${SPOUT_LIBRARY})
ENDIF(ENABLE_SPOUT)
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 idgets PrintSupport) QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Widgets PrintSupport)
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
QT5_USE_MODULES(stellarium Multimedia MultimediaWidgets) QT5_USE_MODULES(stellarium Multimedia MultimediaWidgets)
ENDIF() ENDIF()
IF(ENABLE_SCRIPTING)
QT5_USE_MODULES(stellarium Script)
ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stellarium SerialPort) QT5_USE_MODULES(stellarium SerialPort)
ENDIF() ENDIF()
IF(ENABLE_SPOUT)
TARGET_LINK_LIBRARIES(stellarium ${SPOUT_LIBRARY})
ENDIF(ENABLE_SPOUT)
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)
skipping to change at line 537 skipping to change at line 582
tests/testDates.hpp tests/testDates.hpp
tests/testDates.cpp tests/testDates.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testDates_SRCS ${tests_testDates_SRCS} ${zlib_SRCS}) SET(tests_testDates_SRCS ${tests_testDates_SRCS} ${zlib_SRCS})
ENDIF() ENDIF()
ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS}) ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS})
QT5_USE_MODULES(testDates Core Gui Widgets Script Test) QT5_USE_MODULES(testDates Core Test)
TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDates) ADD_DEPENDENCIES(buildTests testDates)
ADD_TEST(testDates) ADD_TEST(testDates)
SET(tests_testStelFileMgr_SRCS SET(tests_testStelFileMgr_SRCS
tests/testStelFileMgr.hpp tests/testStelFileMgr.hpp
tests/testStelFileMgr.cpp tests/testStelFileMgr.cpp
core/StelFileMgr.hpp core/StelFileMgr.hpp
core/StelFileMgr.cpp core/StelFileMgr.cpp
) )
ADD_EXECUTABLE(testStelFileMgr EXCLUDE_FROM_ALL ${tests_testStelFileMgr_SRC S}) ADD_EXECUTABLE(testStelFileMgr EXCLUDE_FROM_ALL ${tests_testStelFileMgr_SRC S})
QT5_USE_MODULES(testStelFileMgr Core Gui Widgets Script Test) QT5_USE_MODULES(testStelFileMgr Core Test)
TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelFileMgr) ADD_DEPENDENCIES(buildTests testStelFileMgr)
ADD_TEST(testStelFileMgr) ADD_TEST(testStelFileMgr)
SET(tests_testStelSphereGeometry_SRCS SET(tests_testStelSphereGeometry_SRCS
tests/testStelSphereGeometry.hpp tests/testStelSphereGeometry.hpp
tests/testStelSphereGeometry.cpp tests/testStelSphereGeometry.cpp
core/StelSphereGeometry.hpp core/StelSphereGeometry.hpp
core/StelSphereGeometry.cpp core/StelSphereGeometry.cpp
core/StelVertexArray.hpp core/StelVertexArray.hpp
skipping to change at line 580 skipping to change at line 625
core/StelFileMgr.cpp core/StelFileMgr.cpp
core/StelTranslator.hpp core/StelTranslator.hpp
core/StelTranslator.cpp core/StelTranslator.cpp
${glues_lib_SRCS} ${glues_lib_SRCS}
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testStelSphereGeometry_SRCS ${tests_testStelSphereGeometry_S RCS} ${zlib_SRCS}) SET(tests_testStelSphereGeometry_SRCS ${tests_testStelSphereGeometry_S RCS} ${zlib_SRCS})
ENDIF() ENDIF()
ADD_EXECUTABLE(testStelSphereGeometry EXCLUDE_FROM_ALL ${tests_testStelSphe reGeometry_SRCS}) ADD_EXECUTABLE(testStelSphereGeometry EXCLUDE_FROM_ALL ${tests_testStelSphe reGeometry_SRCS})
QT5_USE_MODULES(testStelSphereGeometry Core Gui OpenGL Test) QT5_USE_MODULES(testStelSphereGeometry Core OpenGL Test)
TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelSphereGeometry) ADD_DEPENDENCIES(buildTests testStelSphereGeometry)
ADD_TEST(testStelSphereGeometry) ADD_TEST(testStelSphereGeometry)
#SET(tests_testStelSphericalIndex_SRCS SET(tests_testStelSphericalIndex_SRCS
# tests/testStelSphericalIndex.hpp tests/testStelSphericalIndex.hpp
# tests/testStelSphericalIndex.cpp tests/testStelSphericalIndex.cpp
# core/StelSphericalIndex.hpp core/StelSphericalIndex.hpp
# core/StelSphericalIndex.cpp core/StelSphericalIndex.cpp
# core/StelSphereGeometry.hpp core/StelSphereGeometry.hpp
# core/StelSphereGeometry.cpp core/StelSphereGeometry.cpp
# core/StelVertexArray.hpp core/StelVertexArray.hpp
# core/StelVertexArray.cpp core/StelVertexArray.cpp
# core/OctahedronPolygon.hpp core/OctahedronPolygon.hpp
# core/OctahedronPolygon.cpp core/OctahedronPolygon.cpp
# core/StelJsonParser.hpp core/StelJsonParser.hpp
# core/StelJsonParser.cpp core/StelJsonParser.cpp
# core/StelUtils.cpp core/StelUtils.cpp
# core/StelUtils.hpp core/StelUtils.hpp
# core/StelProjector.cpp core/StelProjector.cpp
# core/StelProjector.hpp core/StelProjector.hpp
# core/StelTranslator.cpp core/StelTranslator.cpp
# core/StelTranslator.hpp core/StelTranslator.hpp
# ${glues_lib_SRCS}) core/StelFileMgr.cpp
#ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSph core/StelFileMgr.hpp
ericalIndex_SRCS}) ${glues_lib_SRCS}
#QT5_USE_MODULES(testStelSphericalIndex Core Gui Widgets OpenGL Script Test )
) IF(WIN32)
#TARGET_LINK_LIBRARIES(testStelSphericalIndex ${extLinkerOptionTest}) # StelUtils required zlib sources
#ADD_DEPENDENCIES(buildTests testStelSphericalIndex) SET(tests_testStelSphericalIndex_SRCS ${tests_testStelSphericalIndex_S
RCS} ${zlib_SRCS})
ENDIF()
ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSphe
ricalIndex_SRCS})
QT5_USE_MODULES(testStelSphericalIndex Core OpenGL Test)
TARGET_LINK_LIBRARIES(testStelSphericalIndex ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelSphericalIndex)
ADD_TEST(testStelSphericalIndex)
SET(tests_testStelJsonParser_SRCS SET(tests_testStelJsonParser_SRCS
tests/testStelJsonParser.hpp tests/testStelJsonParser.hpp
tests/testStelJsonParser.cpp tests/testStelJsonParser.cpp
core/StelJsonParser.hpp core/StelJsonParser.hpp
core/StelJsonParser.cpp core/StelJsonParser.cpp
) )
ADD_EXECUTABLE(testStelJsonParser EXCLUDE_FROM_ALL ${tests_testStelJsonPars er_SRCS}) ADD_EXECUTABLE(testStelJsonParser EXCLUDE_FROM_ALL ${tests_testStelJsonPars er_SRCS})
QT5_USE_MODULES(testStelJsonParser Core Gui Widgets Script Test) QT5_USE_MODULES(testStelJsonParser Core Test)
TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelJsonParser) ADD_DEPENDENCIES(buildTests testStelJsonParser)
ADD_TEST(testStelJsonParser) ADD_TEST(testStelJsonParser)
SET(tests_testStelVertexArray_SRCS SET(tests_testStelVertexArray_SRCS
tests/testStelVertexArray.hpp tests/testStelVertexArray.hpp
tests/testStelVertexArray.cpp tests/testStelVertexArray.cpp
core/StelVertexArray.hpp core/StelVertexArray.hpp
) )
ADD_EXECUTABLE(testStelVertexArray EXCLUDE_FROM_ALL ${tests_testStelVertexA rray_SRCS}) ADD_EXECUTABLE(testStelVertexArray EXCLUDE_FROM_ALL ${tests_testStelVertexA rray_SRCS})
QT5_USE_MODULES(testStelVertexArray Core Gui Test OpenGL) QT5_USE_MODULES(testStelVertexArray Core Test OpenGL)
TARGET_LINK_LIBRARIES(testStelVertexArray ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelVertexArray ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelVertexArray) ADD_DEPENDENCIES(buildTests testStelVertexArray)
ADD_TEST(testStelVertexArray) ADD_TEST(testStelVertexArray)
SET(tests_testDeltaT_SRCS SET(tests_testDeltaT_SRCS
tests/testDeltaT.hpp tests/testDeltaT.hpp
tests/testDeltaT.cpp tests/testDeltaT.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testDeltaT_SRCS ${tests_testDeltaT_SRCS} ${zlib_SRCS}) SET(tests_testDeltaT_SRCS ${tests_testDeltaT_SRCS} ${zlib_SRCS})
ENDIF() ENDIF()
ADD_EXECUTABLE(testDeltaT EXCLUDE_FROM_ALL ${tests_testDeltaT_SRCS}) ADD_EXECUTABLE(testDeltaT EXCLUDE_FROM_ALL ${tests_testDeltaT_SRCS})
QT5_USE_MODULES(testDeltaT Core Gui Widgets Script Test) QT5_USE_MODULES(testDeltaT Core Test)
TARGET_LINK_LIBRARIES(testDeltaT ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testDeltaT ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDeltaT) ADD_DEPENDENCIES(buildTests testDeltaT)
ADD_TEST(testDeltaT) ADD_TEST(testDeltaT)
SET(tests_testConversions_SRCS SET(tests_testConversions_SRCS
tests/testConversions.hpp tests/testConversions.hpp
tests/testConversions.cpp tests/testConversions.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testConversions_SRCS ${tests_testConversions_SRCS} ${zlib_SR CS}) SET(tests_testConversions_SRCS ${tests_testConversions_SRCS} ${zlib_SR CS})
ENDIF() ENDIF()
ADD_EXECUTABLE(testConversions EXCLUDE_FROM_ALL ${tests_testConversions_SRC S}) ADD_EXECUTABLE(testConversions EXCLUDE_FROM_ALL ${tests_testConversions_SRC S})
QT5_USE_MODULES(testConversions Core Gui Widgets Script Test) QT5_USE_MODULES(testConversions Core Test)
TARGET_LINK_LIBRARIES(testConversions ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testConversions ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testConversions) ADD_DEPENDENCIES(buildTests testConversions)
ADD_TEST(testConversions) ADD_TEST(testConversions)
SET(tests_testExtinction_SRCS SET(tests_testExtinction_SRCS
tests/testExtinction.hpp tests/testExtinction.hpp
tests/testExtinction.cpp tests/testExtinction.cpp
core/RefractionExtinction.hpp core/RefractionExtinction.hpp
core/RefractionExtinction.cpp core/RefractionExtinction.cpp
) )
ADD_EXECUTABLE(testExtinction EXCLUDE_FROM_ALL ${tests_testExtinction_SRCS} ) ADD_EXECUTABLE(testExtinction EXCLUDE_FROM_ALL ${tests_testExtinction_SRCS} )
QT5_USE_MODULES(testExtinction Core Gui Widgets Script Test) QT5_USE_MODULES(testExtinction Core Test)
TARGET_LINK_LIBRARIES(testExtinction ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testExtinction ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testExtinction) ADD_DEPENDENCIES(buildTests testExtinction)
ADD_TEST(testExtinction) ADD_TEST(testExtinction)
SET(tests_testRefraction_SRCS SET(tests_testRefraction_SRCS
tests/testRefraction.hpp tests/testRefraction.hpp
tests/testRefraction.cpp tests/testRefraction.cpp
core/RefractionExtinction.hpp core/RefractionExtinction.hpp
core/RefractionExtinction.cpp core/RefractionExtinction.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testRefraction_SRCS ${tests_testRefraction_SRCS} ${zlib_SRCS }) SET(tests_testRefraction_SRCS ${tests_testRefraction_SRCS} ${zlib_SRCS })
ENDIF() ENDIF()
ADD_EXECUTABLE(testRefraction EXCLUDE_FROM_ALL ${tests_testRefraction_SRCS} ) ADD_EXECUTABLE(testRefraction EXCLUDE_FROM_ALL ${tests_testRefraction_SRCS} )
QT5_USE_MODULES(testRefraction Core Gui Widgets Script Test) QT5_USE_MODULES(testRefraction Core Test)
TARGET_LINK_LIBRARIES(testRefraction ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testRefraction ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testRefraction) ADD_DEPENDENCIES(buildTests testRefraction)
ADD_TEST(testRefraction) ADD_TEST(testRefraction)
SET(tests_testPrecession_SRCS SET(tests_testPrecession_SRCS
tests/testPrecession.hpp tests/testPrecession.hpp
tests/testPrecession.cpp tests/testPrecession.cpp
core/planetsephems/precession.h core/planetsephems/precession.h
core/planetsephems/precession.c core/planetsephems/precession.c
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
) )
IF(WIN32) IF(WIN32)
# StelUtils required zlib sources # StelUtils required zlib sources
SET(tests_testPrecession_SRCS ${tests_testPrecession_SRCS} ${zlib_SRCS }) SET(tests_testPrecession_SRCS ${tests_testPrecession_SRCS} ${zlib_SRCS })
ENDIF() ENDIF()
ADD_EXECUTABLE(testPrecession EXCLUDE_FROM_ALL ${tests_testPrecession_SRCS} ) ADD_EXECUTABLE(testPrecession EXCLUDE_FROM_ALL ${tests_testPrecession_SRCS} )
QT5_USE_MODULES(testPrecession Core Gui Widgets Script Test) QT5_USE_MODULES(testPrecession Core Test)
TARGET_LINK_LIBRARIES(testPrecession ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testPrecession ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testPrecession) ADD_DEPENDENCIES(buildTests testPrecession)
ADD_TEST(testPrecession) ADD_TEST(testPrecession)
SET(tests_testEphemeris_SRCS
tests/testEphemeris.hpp
tests/testEphemeris.cpp
core/StelFileMgr.hpp
core/StelFileMgr.cpp
core/VecMath.hpp
core/planetsephems/EphemWrapper.hpp
core/planetsephems/vsop87.h
core/planetsephems/vsop87.c
core/planetsephems/calc_interpolated_elements.h
core/planetsephems/calc_interpolated_elements.c
core/planetsephems/elliptic_to_rectangular.h
core/planetsephems/elliptic_to_rectangular.c
core/planetsephems/de430.hpp
core/planetsephems/de430.cpp
core/planetsephems/de431.hpp
core/planetsephems/de431.cpp
core/planetsephems/jpl_int.h
core/planetsephems/jpleph.h
core/planetsephems/jpleph.cpp
)
ADD_EXECUTABLE(testEphemeris EXCLUDE_FROM_ALL ${tests_testEphemeris_SRCS})
QT5_USE_MODULES(testEphemeris Core Test)
TARGET_LINK_LIBRARIES(testEphemeris ${extLinkerOptionTest})
TARGET_COMPILE_DEFINITIONS(testEphemeris PRIVATE UNIT_TEST)
ADD_DEPENDENCIES(buildTests testEphemeris)
ADD_TEST(testEphemeris)
ADD_CUSTOM_TARGET(tests COMMENT "Run the Stellarium unit tests") ADD_CUSTOM_TARGET(tests COMMENT "Run the Stellarium unit tests")
FOREACH(NAME ${STELLARIUM_TESTS}) FOREACH(NAME ${STELLARIUM_TESTS})
IF(MSVC) IF(MSVC)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${CMAKE_BUIL D_TYPE}/${NAME}.exe WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${CMAKE_BUIL D_TYPE}/${NAME}.exe WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src)
ELSE() ELSE()
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${NAME} WORK ING_DIRECTORY ${CMAKE_BINARY_DIR}/src) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${NAME} WORK ING_DIRECTORY ${CMAKE_BINARY_DIR}/src)
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
ADD_DEPENDENCIES(tests buildTests) ADD_DEPENDENCIES(tests buildTests)
 End of changes. 27 change blocks. 
39 lines changed or deleted 122 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/