CMakeLists.txt   CMakeLists.txt 
SET(glues_lib_SRCS #add our external dependencies first
core/external/glues_stel/source/glues_error.c add_subdirectory(external)
core/external/glues_stel/source/glues_error.h
core/external/glues_stel/source/glues.h
core/external/glues_stel/source/libtess/dict.h
core/external/glues_stel/source/libtess/dict.c
core/external/glues_stel/source/libtess/dict-list.h
core/external/glues_stel/source/libtess/geom.c
core/external/glues_stel/source/libtess/geom.h
core/external/glues_stel/source/libtess/memalloc.c
core/external/glues_stel/source/libtess/memalloc.h
core/external/glues_stel/source/libtess/mesh.c
core/external/glues_stel/source/libtess/mesh.h
core/external/glues_stel/source/libtess/normal.c
core/external/glues_stel/source/libtess/normal.h
core/external/glues_stel/source/libtess/priorityq.c
core/external/glues_stel/source/libtess/priorityq.h
core/external/glues_stel/source/libtess/priorityq-heap.h
core/external/glues_stel/source/libtess/priorityq-heap.i
core/external/glues_stel/source/libtess/priorityq-sort.h
core/external/glues_stel/source/libtess/render.c
core/external/glues_stel/source/libtess/render.h
core/external/glues_stel/source/libtess/sweep.c
core/external/glues_stel/source/libtess/sweep.h
core/external/glues_stel/source/libtess/tess.c
core/external/glues_stel/source/libtess/tess.h
core/external/glues_stel/source/libtess/tessmono.c
core/external/glues_stel/source/libtess/tessmono.h
)
SET(zlib_SRCS
core/external/zlib/adler32.c
core/external/zlib/compress.c
core/external/zlib/crc32.c
core/external/zlib/crc32.h
core/external/zlib/deflate.c
core/external/zlib/deflate.h
core/external/zlib/gzclose.c
core/external/zlib/gzguts.h
core/external/zlib/gzlib.c
core/external/zlib/gzread.c
core/external/zlib/gzwrite.c
core/external/zlib/infback.c
core/external/zlib/inffast.c
core/external/zlib/inffast.h
core/external/zlib/inffixed.h
core/external/zlib/inflate.c
core/external/zlib/inflate.h
core/external/zlib/inftrees.c
core/external/zlib/inftrees.h
core/external/zlib/trees.c
core/external/zlib/trees.h
core/external/zlib/uncompr.c
core/external/zlib/zconf.h
core/external/zlib/zlib.h
core/external/zlib/zutil.c
core/external/zlib/zutil.h
)
IF(ENABLE_SPOUT) IF(ENABLE_SPOUT)
SET(spout_SRCS SET(spout_SRCS
core/external/SpoutLibrary.h external/SpoutLibrary.h
core/SpoutSender.hpp core/SpoutSender.hpp
core/SpoutSender.cpp core/SpoutSender.cpp
) )
ENDIF() 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
skipping to change at line 174 skipping to change at line 118
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
${gl_lib_SRCS}
${glues_lib_SRCS}
${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
core/planetsephems/gust86.h core/planetsephems/gust86.h
skipping to change at line 298 skipping to change at line 238
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
core/modules/Nebula.hpp core/modules/Nebula.hpp
) )
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
${stellarium_lib_moc_SRCS} ${stellarium_lib_moc_SRCS}
) )
ENDIF() ENDIF()
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
core/external/qtcompress/qzip.cpp
core/external/qtcompress/qzipreader.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
scripting/StelMainScriptAPI.cpp scripting/StelMainScriptAPI.cpp
scripting/StelMainScriptAPI.hpp scripting/StelMainScriptAPI.hpp
scripting/StelMainScriptAPIProxy.cpp scripting/StelMainScriptAPIProxy.cpp
scripting/StelMainScriptAPIProxy.hpp scripting/StelMainScriptAPIProxy.hpp
) )
ENDIF() ENDIF()
IF(WIN32)
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
${zlib_SRCS}
)
ENDIF()
SET(stellarium_exe_SRCS main.cpp) SET(stellarium_exe_SRCS main.cpp)
################# compiles resources files ############ ################# compiles resources files ############
SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc) SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc)
QT5_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES}) QT5_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
########################################################################### ################## ########################################################################### ##################
############################# Standard GUI plugin compilation ############# ################## ############################# Standard GUI plugin compilation ############# ##################
########################################################################### ################## ########################################################################### ##################
IF(STELLARIUM_GUI_MODE STREQUAL "Standard") IF(STELLARIUM_GUI_MODE STREQUAL "Standard")
skipping to change at line 427 skipping to change at line 353
) )
ENDIF() ENDIF()
ENDIF() ENDIF()
QT5_WRAP_UI(stellarium_UIS_H ${stellarium_UIS}) QT5_WRAP_UI(stellarium_UIS_H ${stellarium_UIS})
# compiles resources files # compiles resources files
SET(stellarium_gui_RES ${CMAKE_SOURCE_DIR}/data/gui/guiRes.qrc) SET(stellarium_gui_RES ${CMAKE_SOURCE_DIR}/data/gui/guiRes.qrc)
QT5_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES}) QT5_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES})
SET(extLinkerOption ${extLinkerOption} ${QT_QTSCRIPT_LIBRARY} ${OPENGL _LIBRARIES})
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} ${stellarium_gui_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX}) SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} ${stellarium_gui_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX})
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
################################ No GUI plugin compilation ################ ################## ################################ No GUI plugin compilation ################ ##################
########################################################################### ################## ########################################################################### ##################
IF (STELLARIUM_GUI_MODE STREQUAL "None") IF (STELLARIUM_GUI_MODE STREQUAL "None")
ADD_DEFINITIONS(-DNO_GUI) ADD_DEFINITIONS(-DNO_GUI)
ENDIF() ENDIF()
skipping to change at line 468 skipping to change at line 393
# 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 ####################### ##################
########################################################################### ################## ########################################################################### ##################
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 # This library is required on MinGW builds for some native methods used
is disabled. in a fix in main.cpp
# Because including it here seems to duplicate STELLARIUM_STATIC_PLUGINS_LI SET(winMMLib libwinmm.a)
BRARIES
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( 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)
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()
# Setup Qt5 dependencies
SET(STELLARIUM_QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Gui ${STEL_GLES_
LIBS} Qt5::Network Qt5::Widgets)
IF(ENABLE_MEDIA)
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Multimedia
Qt5::MultimediaWidgets)
ENDIF()
IF(ENABLE_SCRIPTING)
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::Script)
ENDIF()
if(USE_OLD_QGLWIDGET)
# The Qt5OpenGL library is only required when using the legacy viewpor
t
SET(STELLARIUM_QT_LIBRARIES ${STELLARIUM_QT_LIBRARIES} Qt5::OpenGL)
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 possibl # automatically copy the spout .dll to the binary directory, if possib
e le
configure_file(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONL CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYON
Y) LY)
endif() endif()
set(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_
stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SP
OUT_LIBRARY})
# 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 ${extLinkerOption} ${STELLARIUM_STATIC_ TARGET_LINK_LIBRARIES(stelMain ${STELMAIN_DEPS})
PLUGINS_LIBRARIES})
QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Widgets Pr
intSupport)
IF(ENABLE_MEDIA)
QT5_USE_MODULES(stelMain Multimedia MultimediaWidgets)
ENDIF()
IF(ENABLE_SCRIPTING)
QT5_USE_MODULES(stelMain Script)
ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stelMain SerialPort)
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 stelMain ${winMMLib})
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 TARGET_LINK_LIBRARIES(stellarium ${winMMLib} ${STELMAIN_DEPS})
C_PLUGINS_LIBRARIES})
# This will add the ANGLE lib if the Qt version supports it.
TARGET_LINK_LIBRARIES(stellarium ${Qt5Gui_LIBRARIES} ${Qt5Gui_OPENGL_L
IBRARIES})
QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Widgets
PrintSupport)
IF(ENABLE_MEDIA)
QT5_USE_MODULES(stellarium Multimedia MultimediaWidgets)
ENDIF()
IF(ENABLE_SCRIPTING)
QT5_USE_MODULES(stellarium Script)
ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stellarium SerialPort)
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 566 skipping to change at line 471
########################################################################### ################## ########################################################################### ##################
################################## Build unit tests ####################### ################## ################################## Build unit tests ####################### ##################
########################################################################### ################## ########################################################################### ##################
SET(STELLARIUM_TESTS) SET(STELLARIUM_TESTS)
MACRO(ADD_TEST NAME) MACRO(ADD_TEST NAME)
SET(STELLARIUM_TESTS ${STELLARIUM_TESTS} ${NAME}) SET(STELLARIUM_TESTS ${STELLARIUM_TESTS} ${NAME})
ENDMACRO() ENDMACRO()
SET(extLinkerOptionTest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_Q TTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIE S} ${ZLIB_LIBRARIES}) SET(TESTS_LIBRARIES ${ZLIB_LIBRARIES} Qt5::Core Qt5::Gui Qt5::Test)
# Custom target used to build all tests at once # Custom target used to build all tests at once
ADD_CUSTOM_TARGET(buildTests) ADD_CUSTOM_TARGET(buildTests)
SET(tests_testDates_SRCS SET(tests_testDates_SRCS
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)
# StelUtils required zlib sources
SET(tests_testDates_SRCS ${tests_testDates_SRCS} ${zlib_SRCS})
ENDIF()
ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS}) ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS})
QT5_USE_MODULES(testDates Core Test) TARGET_LINK_LIBRARIES(testDates ${TESTS_LIBRARIES})
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 Test) TARGET_LINK_LIBRARIES(testStelFileMgr ${TESTS_LIBRARIES})
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
core/StelVertexArray.cpp core/StelVertexArray.cpp
skipping to change at line 618 skipping to change at line 517
core/StelJsonParser.hpp core/StelJsonParser.hpp
core/StelJsonParser.cpp core/StelJsonParser.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelUtils.cpp core/StelUtils.cpp
core/StelProjector.hpp core/StelProjector.hpp
core/StelProjector.cpp core/StelProjector.cpp
core/StelFileMgr.hpp core/StelFileMgr.hpp
core/StelFileMgr.cpp core/StelFileMgr.cpp
core/StelTranslator.hpp core/StelTranslator.hpp
core/StelTranslator.cpp core/StelTranslator.cpp
${glues_lib_SRCS}
) )
IF(WIN32)
# StelUtils required zlib sources
SET(tests_testStelSphereGeometry_SRCS ${tests_testStelSphereGeometry_S
RCS} ${zlib_SRCS})
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 OpenGL Test) TARGET_LINK_LIBRARIES(testStelSphereGeometry ${TESTS_LIBRARIES} glues_stel)
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
core/StelFileMgr.cpp # ${glues_lib_SRCS})
core/StelFileMgr.hpp #ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSph
${glues_lib_SRCS} ericalIndex_SRCS})
) #TARGET_LINK_LIBRARIES(testStelSphericalIndex ${TESTS_LIBRARIES})
IF(WIN32) #ADD_DEPENDENCIES(buildTests testStelSphericalIndex)
# StelUtils required zlib sources
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 Test) TARGET_LINK_LIBRARIES(testStelJsonParser ${TESTS_LIBRARIES})
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 Test OpenGL) TARGET_LINK_LIBRARIES(testStelVertexArray ${TESTS_LIBRARIES})
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)
# StelUtils required zlib sources
SET(tests_testDeltaT_SRCS ${tests_testDeltaT_SRCS} ${zlib_SRCS})
ENDIF()
ADD_EXECUTABLE(testDeltaT EXCLUDE_FROM_ALL ${tests_testDeltaT_SRCS}) ADD_EXECUTABLE(testDeltaT EXCLUDE_FROM_ALL ${tests_testDeltaT_SRCS})
QT5_USE_MODULES(testDeltaT Core Test) TARGET_LINK_LIBRARIES(testDeltaT ${TESTS_LIBRARIES})
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)
# StelUtils required zlib sources
SET(tests_testConversions_SRCS ${tests_testConversions_SRCS} ${zlib_SR
CS})
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 Test) TARGET_LINK_LIBRARIES(testConversions ${TESTS_LIBRARIES})
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 Test) TARGET_LINK_LIBRARIES(testExtinction ${TESTS_LIBRARIES})
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)
# StelUtils required zlib sources
SET(tests_testRefraction_SRCS ${tests_testRefraction_SRCS} ${zlib_SRCS
})
ENDIF()
ADD_EXECUTABLE(testRefraction EXCLUDE_FROM_ALL ${tests_testRefraction_SRCS} ) ADD_EXECUTABLE(testRefraction EXCLUDE_FROM_ALL ${tests_testRefraction_SRCS} )
QT5_USE_MODULES(testRefraction Core Test) TARGET_LINK_LIBRARIES(testRefraction ${TESTS_LIBRARIES})
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)
# StelUtils required zlib sources
SET(tests_testPrecession_SRCS ${tests_testPrecession_SRCS} ${zlib_SRCS
})
ENDIF()
ADD_EXECUTABLE(testPrecession EXCLUDE_FROM_ALL ${tests_testPrecession_SRCS} ) ADD_EXECUTABLE(testPrecession EXCLUDE_FROM_ALL ${tests_testPrecession_SRCS} )
QT5_USE_MODULES(testPrecession Core Test) TARGET_LINK_LIBRARIES(testPrecession ${TESTS_LIBRARIES})
TARGET_LINK_LIBRARIES(testPrecession ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testPrecession) ADD_DEPENDENCIES(buildTests testPrecession)
ADD_TEST(testPrecession) ADD_TEST(testPrecession)
SET(tests_testEphemeris_SRCS SET(tests_testEphemeris_SRCS
tests/testEphemeris.hpp tests/testEphemeris.hpp
tests/testEphemeris.cpp tests/testEphemeris.cpp
core/StelFileMgr.hpp core/StelFileMgr.hpp
core/StelFileMgr.cpp core/StelFileMgr.cpp
core/VecMath.hpp core/VecMath.hpp
core/planetsephems/EphemWrapper.hpp core/planetsephems/EphemWrapper.hpp
skipping to change at line 788 skipping to change at line 649
core/planetsephems/elliptic_to_rectangular.c core/planetsephems/elliptic_to_rectangular.c
core/planetsephems/de430.hpp core/planetsephems/de430.hpp
core/planetsephems/de430.cpp core/planetsephems/de430.cpp
core/planetsephems/de431.hpp core/planetsephems/de431.hpp
core/planetsephems/de431.cpp core/planetsephems/de431.cpp
core/planetsephems/jpl_int.h core/planetsephems/jpl_int.h
core/planetsephems/jpleph.h core/planetsephems/jpleph.h
core/planetsephems/jpleph.cpp core/planetsephems/jpleph.cpp
) )
ADD_EXECUTABLE(testEphemeris EXCLUDE_FROM_ALL ${tests_testEphemeris_SRCS}) ADD_EXECUTABLE(testEphemeris EXCLUDE_FROM_ALL ${tests_testEphemeris_SRCS})
QT5_USE_MODULES(testEphemeris Core Test) TARGET_LINK_LIBRARIES(testEphemeris ${TESTS_LIBRARIES})
TARGET_LINK_LIBRARIES(testEphemeris ${extLinkerOptionTest})
TARGET_COMPILE_DEFINITIONS(testEphemeris PRIVATE UNIT_TEST) TARGET_COMPILE_DEFINITIONS(testEphemeris PRIVATE UNIT_TEST)
ADD_DEPENDENCIES(buildTests testEphemeris) ADD_DEPENDENCIES(buildTests testEphemeris)
ADD_TEST(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)
 End of changes. 34 change blocks. 
219 lines changed or deleted 70 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/