CMakeLists.txt   CMakeLists.txt 
skipping to change at line 255 skipping to change at line 255
IF(!WIN32) IF(!WIN32)
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
) )
ENDIF() ENDIF()
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.cpp
scripting/StelScriptMgr.cpp scripting/StelScriptMgr.cpp
scripting/StratoscriptPreprocessor.cpp scripting/StratoscriptPreprocessor.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
) )
skipping to change at line 485 skipping to change at line 487
ENDIF() ENDIF()
ADD_DEPENDENCIES(stellarium AllStaticPlugins) ADD_DEPENDENCIES(stellarium AllStaticPlugins)
INSTALL(TARGETS stellarium DESTINATION bin) INSTALL(TARGETS stellarium DESTINATION bin)
########################################################################### ################## ########################################################################### ##################
################################## Build unit tests ####################### ################## ################################## Build unit tests ####################### ##################
########################################################################### ################## ########################################################################### ##################
SET(STELLARIUM_TESTS)
MACRO(ADD_TEST NAME)
SET(STELLARIUM_TESTS ${STELLARIUM_TESTS} ${NAME})
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(extLinkerOptionTest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_Q TTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIE S} ${ZLIB_LIBRARIES})
# 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 Gui Widgets Script Declarative Test) QT5_USE_MODULES(testDates Core Gui Widgets Script Declarative Test)
TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDates) ADD_DEPENDENCIES(buildTests 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 Declarative Test) QT5_USE_MODULES(testStelFileMgr Core Gui Widgets Script Declarative Test)
TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelFileMgr) ADD_DEPENDENCIES(buildTests 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
core/OctahedronPolygon.hpp core/OctahedronPolygon.hpp
core/OctahedronPolygon.cpp core/OctahedronPolygon.cpp
skipping to change at line 530 skipping to change at line 543
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}) ${glues_lib_SRCS})
IF(WIN32)
# StelUtils required zlib sources
SET(tests_testStelSphereGeometry_SRCS ${tests_testStelSphereGeometry
_SRCS} ${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 Gui OpenGL Test) QT5_USE_MODULES(testStelSphereGeometry Core Gui OpenGL Test)
TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelSphereGeometry) ADD_DEPENDENCIES(buildTests 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
skipping to change at line 569 skipping to change at line 587
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 Declarative Test ) QT5_USE_MODULES(testStelJsonParser Core Gui Widgets Script Declarative Test )
TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelJsonParser) ADD_DEPENDENCIES(buildTests 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 Gui Test OpenGL)
TARGET_LINK_LIBRARIES(testStelVertexArray ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelVertexArray ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelVertexArray) ADD_DEPENDENCIES(buildTests 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 Gui Widgets Script Declarative Test) QT5_USE_MODULES(testDeltaT Core Gui Widgets Script Declarative Test)
TARGET_LINK_LIBRARIES(testDeltaT ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testDeltaT ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDeltaT) ADD_DEPENDENCIES(buildTests 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_
SRCS})
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 Declarative Test) QT5_USE_MODULES(testConversions Core Gui Widgets Script Declarative Test)
TARGET_LINK_LIBRARIES(testConversions ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testConversions ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testConversions) ADD_DEPENDENCIES(buildTests testConversions)
ADD_TEST(testConversions)
ADD_CUSTOM_TARGET(tests COMMENT "Run the Stellarium unit tests") ADD_CUSTOM_TARGET(tests COMMENT "Run the Stellarium unit tests")
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testDates WORKING_DIRE FOREACH(NAME ${STELLARIUM_TESTS})
CTORY ${CMAKE_BINARY_DIR}/src/) IF(MSVC)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelFileMgr WORKIN ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${CMAKE
G_DIRECTORY ${CMAKE_BINARY_DIR}/src/) _BUILD_TYPE}/${NAME}.exe WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphereGeometry ELSE()
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./${NAME}
#ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphericalInde WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src)
x WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ENDIF()
#ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelVertexBuffer ENDFOREACH()
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelJsonParser WOR
KING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelVertexArray WO
RKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testDeltaT WORKING_DIR
ECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testConversions WORKIN
G_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_DEPENDENCIES(tests buildTests) ADD_DEPENDENCIES(tests buildTests)
 End of changes. 14 change blocks. 
18 lines changed or deleted 41 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/