CMakeLists.txt   CMakeLists.txt 
SET(glues_lib_SRCS SET(glues_lib_SRCS
core/external/glues_stel/source/glues_error.c core/external/glues_stel/source/glues_error.c
core/external/glues_stel/source/glues_error.h core/external/glues_stel/source/glues_error.h
core/external/glues_stel/source/glues.h core/external/glues_stel/source/glues.h
core/external/glues_stel/source/libtess/dict.h core/external/glues_stel/source/libtess/dict.h
core/external/glues_stel/source/libtess/dict.c core/external/glues_stel/source/libtess/dict.c
core/external/glues_stel/source/libtess/dict-list.h core/external/glues_stel/source/libtess/dict-list.h
core/external/glues_stel/source/libtess/geom.c core/external/glues_stel/source/libtess/geom.c
core/external/glues_stel/source/libtess/geom.h core/external/glues_stel/source/libtess/geom.h
core/external/glues_stel/source/libtess/memalloc.c core/external/glues_stel/source/libtess/memalloc.c
skipping to change at line 415 skipping to change at line 414
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/CustomInfoDialog.hpp
gui/CustomInfoDialog.cpp
gui/StelDialog.hpp gui/StelDialog.hpp
gui/StelDialog.cpp) gui/StelDialog.cpp)
################# compiles GUI moc files ############ ################# compiles GUI moc files ############
SET(stellarium_gui_MOC_HDRS SET(stellarium_gui_MOC_HDRS
gui/StelGui.hpp gui/StelGui.hpp
gui/SkyGui.hpp gui/SkyGui.hpp
gui/StelGuiItems.hpp gui/StelGuiItems.hpp
gui/HelpDialog.hpp gui/HelpDialog.hpp
gui/Dialog.hpp gui/Dialog.hpp
gui/MapLabel.hpp gui/MapLabel.hpp
gui/AngleSpinBox.hpp gui/AngleSpinBox.hpp
gui/LocationDialog.hpp gui/LocationDialog.hpp
gui/DateTimeDialog.hpp gui/DateTimeDialog.hpp
gui/ViewDialog.hpp gui/ViewDialog.hpp
gui/SearchDialog.hpp gui/SearchDialog.hpp
gui/ConfigurationDialog.hpp gui/ConfigurationDialog.hpp
gui/AddRemoveLandscapesDialog.hpp gui/AddRemoveLandscapesDialog.hpp
gui/AtmosphereDialog.hpp gui/AtmosphereDialog.hpp
gui/CustomInfoDialog.hpp
gui/StelDialog.hpp) gui/StelDialog.hpp)
################# 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/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/CustomInfoDialog.ui
gui/addRemoveLandscapesDialog.ui) gui/addRemoveLandscapesDialog.ui)
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)
SET(stellarium_gui_MOC_HDRS ${stellarium_gui_MOC_HDRS} SET(stellarium_gui_MOC_HDRS ${stellarium_gui_MOC_HDRS}
gui/ScriptConsole.hpp gui/ScriptConsole.hpp
skipping to change at line 573 skipping to change at line 576
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src/${CMAKE_C FG_INTDIR}/libTimeZoneConfiguration.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src/${CMAKE_C FG_INTDIR}/libTimeZoneConfiguration.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TIMEZONECONFIGURATION) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TIMEZONECONFIGURATION)
ENDIF() ENDIF()
IF (USE_PLUGIN_SUPERNOVAE) IF (USE_PLUGIN_SUPERNOVAE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Supernovae/src/${CMAKE_CFG_INTDIR}/ libSupernovae.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Supernovae/src/${CMAKE_CFG_INTDIR}/ libSupernovae.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SUPERNOVAE) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SUPERNOVAE)
ENDIF() ENDIF()
IF (USE_PLUGIN_QUASARS) IF (USE_PLUGIN_QUASARS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIB SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
RARIES} "${CMAKE_BINARY_DIR}/plugins/Quasars/src/${CMAKE_CFG_INTDIR}/libQua LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Quasars/src/${CMAKE_CFG_INTDIR}/lib
sars.a") Quasars.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_QUASARS) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_QUASARS)
ENDIF() ENDIF()
IF (USE_PLUGIN_PULSARS) IF (USE_PLUGIN_PULSARS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIB SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
RARIES} "${CMAKE_BINARY_DIR}/plugins/Pulsars/src/${CMAKE_CFG_INTDIR}/libPul LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Pulsars/src/${CMAKE_CFG_INTDIR}/lib
sars.a") Pulsars.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_PULSARS) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_PULSARS)
ENDIF() ENDIF()
IF (USE_PLUGIN_SVMT) IF (USE_PLUGIN_SVMT)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/svmt/src/${CMAKE_CFG_INTDIR}/libSVMT .a) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/svmt/src/${CMAKE_CFG_INTDIR}/libSVMT .a)
IF(APPLE) IF(APPLE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} "-framework QtDeclarative") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} "-framework QtDeclarative")
ELSE() ELSE()
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} ${QT_LIBRARY_DIR}/libQtDeclarative.so) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN S_LIBRARIES} ${QT_LIBRARY_DIR}/libQtDeclarative.so)
ENDIF() ENDIF()
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SVMT) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SVMT)
skipping to change at line 671 skipping to change at line 674
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.hpp
core/StelTranslator.cpp
core/StelTranslator.hpp
${glues_lib_SRCS}) ${glues_lib_SRCS})
QT4_WRAP_CPP(testStelSphereGeometry_MOC_SRCS tests/testStelSphereGeometry.h pp) QT4_WRAP_CPP(testStelSphereGeometry_MOC_SRCS tests/testStelSphereGeometry.h pp)
ADD_EXECUTABLE(testStelSphereGeometry EXCLUDE_FROM_ALL ${tests_testStelSphe reGeometry_SRCS} ${testStelSphereGeometry_MOC_SRCS}) ADD_EXECUTABLE(testStelSphereGeometry EXCLUDE_FROM_ALL ${tests_testStelSphe reGeometry_SRCS} ${testStelSphereGeometry_MOC_SRCS})
TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest} ${QT_QT OPENGL_LIBRARY}) TARGET_LINK_LIBRARIES(testStelSphereGeometry ${extLinkerOptionTest} ${QT_QT OPENGL_LIBRARY})
ADD_DEPENDENCIES(buildTests testStelSphereGeometry) ADD_DEPENDENCIES(buildTests 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
skipping to change at line 692 skipping to change at line 699
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.hpp
core/StelTranslator.cpp
core/StelTranslator.hpp
${glues_lib_SRCS}) ${glues_lib_SRCS})
QT4_WRAP_CPP(tests_testStelSphericalIndex_MOC_SRCS tests/testStelSphericalI ndex.hpp) QT4_WRAP_CPP(tests_testStelSphericalIndex_MOC_SRCS tests/testStelSphericalI ndex.hpp)
ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSphe ricalIndex_SRCS} ${tests_testStelSphericalIndex_MOC_SRCS}) ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSphe ricalIndex_SRCS} ${tests_testStelSphericalIndex_MOC_SRCS})
TARGET_LINK_LIBRARIES(testStelSphericalIndex ${extLinkerOptionTest} ${QT_QT OPENGL_LIBRARY}) TARGET_LINK_LIBRARIES(testStelSphericalIndex ${extLinkerOptionTest} ${QT_QT OPENGL_LIBRARY})
ADD_DEPENDENCIES(buildTests testStelSphericalIndex) ADD_DEPENDENCIES(buildTests 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
 End of changes. 8 change blocks. 
9 lines changed or deleted 20 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/