CMakeLists.txt   CMakeLists.txt 
skipping to change at line 41 skipping to change at line 41
IF (OPENGL_MODE STREQUAL "Desktop") IF (OPENGL_MODE STREQUAL "Desktop")
SET(gl_lib_SRCS core/external/GLee.c core/external/GLee.h) SET(gl_lib_SRCS core/external/GLee.c core/external/GLee.h)
ENDIF() ENDIF()
IF(OPENGL_MODE STREQUAL "ES2") IF(OPENGL_MODE STREQUAL "ES2")
SET(gl_lib_SRCS core/external/GLee.h) SET(gl_lib_SRCS core/external/GLee.h)
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.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
core/StelObserver.hpp core/StelObserver.hpp
core/StelLocation.hpp core/StelLocation.hpp
core/StelLocation.cpp core/StelLocation.cpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelLocationMgr.cpp core/StelLocationMgr.cpp
skipping to change at line 338 skipping to change at line 340
################# compiles resources files ############ ################# compiles resources files ############
SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc) SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc)
QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES}) QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
################# compiles moc files ############ ################# compiles moc files ############
# Add here all the files which require moc compilation # Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc.. # that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(stellarium_MOC_HDRS SET(stellarium_MOC_HDRS
core/StelAudioMgr.hpp core/StelAudioMgr.hpp
core/StelVideoMgr.hpp
core/StelModuleMgr.hpp core/StelModuleMgr.hpp
core/StelObjectMgr.hpp core/StelObjectMgr.hpp
core/StelObserver.hpp core/StelObserver.hpp
core/StelApp.hpp core/StelApp.hpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelCore.hpp core/StelCore.hpp
core/StelAppGraphicsWidget.hpp core/StelAppGraphicsWidget.hpp
core/StelTexture.hpp core/StelTexture.hpp
core/StelMovementMgr.hpp core/StelMovementMgr.hpp
core/MultiLevelJsonBase.hpp core/MultiLevelJsonBase.hpp
skipping to change at line 414 skipping to change at line 417
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 520 skipping to change at line 519
########################################################################### #################### ########################################################################### ####################
################## Static plugins need to be known by the file StelMainGrap hicsView.cpp at compilation time ################## Static plugins need to be known by the file StelMainGrap hicsView.cpp at compilation time
################## so add the definitions to the compilation. ################## so add the definitions to the compilation.
################## Also add the full path to the .a libraries at compilatio n time. ################## Also add the full path to the .a libraries at compilatio n time.
IF (BUILD_STATIC_PLUGINS) IF (BUILD_STATIC_PLUGINS)
IF (USE_PLUGIN_HELLOSTELMODULE) IF (USE_PLUGIN_HELLOSTELMODULE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/HelloStelModule/src/${CMAKE_CFG_INT DIR}/libHelloStelModule.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/HelloStelModule/src/${CMAKE_CFG_INT DIR}/libHelloStelModule.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_HELLOSTELMODULE) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_HELLOSTELMODULE)
ENDIF() ENDIF()
IF (USE_PLUGIN_OBSERVABILITY)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Observability/src/${CMAKE_CFG_INTDI
R}/libObservability.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_OBSERVABILITY)
ENDIF()
IF (USE_PLUGIN_ANGLEMEASURE) IF (USE_PLUGIN_ANGLEMEASURE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/AngleMeasure/src/${CMAKE_CFG_INTDIR }/libAngleMeasure.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/AngleMeasure/src/${CMAKE_CFG_INTDIR }/libAngleMeasure.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_ANGLEMEASURE) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_ANGLEMEASURE)
ENDIF() ENDIF()
IF (USE_PLUGIN_COMPASSMARKS) IF (USE_PLUGIN_COMPASSMARKS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/CompassMarks/src/${CMAKE_CFG_INTDIR }/libCompassMarks.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/CompassMarks/src/${CMAKE_CFG_INTDIR }/libCompassMarks.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_COMPASSMARKS) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_COMPASSMARKS)
ENDIF() ENDIF()
skipping to change at line 585 skipping to change at line 589
IF (USE_PLUGIN_QUASARS) IF (USE_PLUGIN_QUASARS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Quasars/src/${CMAKE_CFG_INTDIR}/lib Quasars.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Quasars/src/${CMAKE_CFG_INTDIR}/lib 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_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Pulsars/src/${CMAKE_CFG_INTDIR}/lib Pulsars.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Pulsars/src/${CMAKE_CFG_INTDIR}/lib Pulsars.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_PULSARS) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_PULSARS)
ENDIF() ENDIF()
IF (USE_PLUGIN_EXOPLANETS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIB
RARIES} "${CMAKE_BINARY_DIR}/plugins/Exoplanets/src/${CMAKE_CFG_INTDIR}/lib
Exoplanets.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_EXOPLANETS)
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)
ENDIF() ENDIF()
skipping to change at line 613 skipping to change at line 622
########################################################################### ################## ########################################################################### ##################
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} ${ZLIB_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} ${ZLIB_LIBRARIES})
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
SET(extLinkerOption ${extLinkerOption} ${QT_QTSCRIPT_LIBRARY}) SET(extLinkerOption ${extLinkerOption} ${QT_QTSCRIPT_LIBRARY})
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
SET(extLinkerOption ${extLinkerOption} libwinmm.a) SET(extLinkerOption ${extLinkerOption} libwinmm.a)
ENDIF() ENDIF()
IF(WIN32 AND ENABLE_WINDOWS_EXE_ICON)
IF(RC_COMPILER_PATH)
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o
COMMAND ${RC_COMPILER_PATH} ${CMAKE_SOURCE_DIR}/data
/stellarium.rc ${CMAKE_BINARY_DIR}/stellarium-rc.o
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data)
SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINARY_DIR}/stel
larium-rc.o)
ENDIF(RC_COMPILER_PATH)
ENDIF(WIN32 AND ENABLE_WINDOWS_EXE_ICON)
IF(GENERATE_STELMAINLIB) IF(GENERATE_STELMAINLIB)
ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_MOC_SRCS} ${stellarium_RES_CXX}) ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_MOC_SRCS} ${stellarium_RES_CXX})
TARGET_LINK_LIBRARIES(stelMain ${extLinkerOption} ${STELLARIUM_STATIC_PLUG INS_LIBRARIES}) TARGET_LINK_LIBRARIES(stelMain ${extLinkerOption} ${STELLARIUM_STATIC_PLUG INS_LIBRARIES})
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} st elMain ${extLinkerOption}) TARGET_LINK_LIBRARIES(stellarium ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} st elMain ${extLinkerOption})
ELSE() ELSE()
ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_MOC_SRCS} ${ stellarium_RES_CXX} ${stellarium_exe_SRCS}) ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_MOC_SRCS} ${ stellarium_RES_CXX} ${stellarium_exe_SRCS})
TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATIC_PL UGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATIC_PL UGINS_LIBRARIES})
 End of changes. 8 change blocks. 
4 lines changed or deleted 28 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/