CMakeLists.txt   CMakeLists.txt 
skipping to change at line 207 skipping to change at line 207
core/modules/MilkyWay.cpp core/modules/MilkyWay.cpp
core/modules/MilkyWay.hpp core/modules/MilkyWay.hpp
core/modules/Nebula.cpp core/modules/Nebula.cpp
core/modules/Nebula.hpp core/modules/Nebula.hpp
core/modules/NebulaMgr.cpp core/modules/NebulaMgr.cpp
core/modules/NebulaMgr.hpp core/modules/NebulaMgr.hpp
core/modules/Orbit.cpp core/modules/Orbit.cpp
core/modules/Orbit.hpp core/modules/Orbit.hpp
core/modules/Planet.cpp core/modules/Planet.cpp
core/modules/Planet.hpp core/modules/Planet.hpp
core/modules/MinorPlanet.cpp
core/modules/MinorPlanet.hpp
core/modules/Comet.cpp
core/modules/Comet.hpp
core/modules/Skybright.cpp core/modules/Skybright.cpp
core/modules/Skybright.hpp core/modules/Skybright.hpp
core/modules/Skylight.cpp core/modules/Skylight.cpp
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
skipping to change at line 409 skipping to change at line 413
gui/LocationDialog.hpp gui/LocationDialog.hpp
gui/LocationDialog.cpp gui/LocationDialog.cpp
gui/DateTimeDialog.hpp gui/DateTimeDialog.hpp
gui/DateTimeDialog.cpp gui/DateTimeDialog.cpp
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.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/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/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
gui/StelScriptSyntaxHighlighter.hpp) gui/StelScriptSyntaxHighlighter.hpp)
skipping to change at line 464 skipping to change at line 472
# 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)
QT4_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES}) QT4_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES})
SET(extLinkerOption ${QT_LIBRARIES} ${QT_QTSCRIPT_LIBRARY} ${OPENGL_ LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} ) SET(extLinkerOption ${QT_LIBRARIES} ${QT_QTSCRIPT_LIBRARY} ${OPENGL_ LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} )
# Compile the static library # Compile the static library
ADD_LIBRARY(StelGuiLib STATIC ${stellarium_gui_SRCS} ${stellarium_gu i_MOC_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX}) ADD_LIBRARY(StelGuiLib STATIC ${stellarium_gui_SRCS} ${stellarium_gu i_MOC_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX})
TARGET_LINK_LIBRARIES(StelGuiLib ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(StelGuiLib ${StelMain} ${extLinkerOption})
IF(WIN32) SET_TARGET_PROPERTIES(StelGuiLib PROPERTIES COMPILE_FLAGS "-DQT_STAT
SET_TARGET_PROPERTIES(StelGuiLib PROPERTIES COMPILE_FLAGS "- ICPLUGIN")
DQT_STATICPLUGIN")
ELSE()
SET_TARGET_PROPERTIES(StelGuiLib PROPERTIES COMPILE_FLAGS "-
fPIC -DQT_STATICPLUGIN")
ENDIF()
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/src/${CMAKE_CFG_INTDIR}/libStelGuiLib.a) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/src/${CMAKE_CFG_INTDIR}/libStelGuiLib.a)
ADD_DEPENDENCIES(AllStaticPlugins StelGuiLib) ADD_DEPENDENCIES(AllStaticPlugins StelGuiLib)
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
################################ No GUI plugin compilation ################ ################## ################################ No GUI plugin compilation ################ ##################
########################################################################### ################## ########################################################################### ##################
IF (GUI_MODE STREQUAL "None") IF (GUI_MODE STREQUAL "None")
SET(stellarium_nogui_SRCS SET(stellarium_nogui_SRCS
noGui/StelNoGui.hpp noGui/StelNoGui.hpp
noGui/StelNoGui.cpp) noGui/StelNoGui.cpp)
SET(stellarium_nogui_MOC_HDRS SET(stellarium_nogui_MOC_HDRS
noGui/StelNoGui.hpp) noGui/StelNoGui.hpp)
QT4_WRAP_CPP(stellarium_nogui_MOC_SRCS ${stellarium_nogui_MOC_HDRS}) QT4_WRAP_CPP(stellarium_nogui_MOC_SRCS ${stellarium_nogui_MOC_HDRS})
ADD_LIBRARY(StelNoGuiLib STATIC ${stellarium_nogui_SRCS} ${stellariu m_nogui_MOC_SRCS}) ADD_LIBRARY(StelNoGuiLib STATIC ${stellarium_nogui_SRCS} ${stellariu m_nogui_MOC_SRCS})
TARGET_LINK_LIBRARIES(StelNoGuiLib ${extLinkerOption}) TARGET_LINK_LIBRARIES(StelNoGuiLib ${extLinkerOption})
IF(WIN32) SET_TARGET_PROPERTIES(StelNoGuiLib PROPERTIES COMPILE_FLAGS "-DQT_ST
SET_TARGET_PROPERTIES(StelNoGuiLib PROPERTIES COMPILE_FLAGS ATICPLUGIN")
"-DQT_STATICPLUGIN")
ELSE()
SET_TARGET_PROPERTIES(StelNoGuiLib PROPERTIES COMPILE_FLAGS
"-fPIC -DQT_STATICPLUGIN")
ENDIF()
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/src/libStelNoGuiLib.a) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/src/libStelNoGuiLib.a)
ADD_DEPENDENCIES(AllStaticPlugins StelNoGuiLib) ADD_DEPENDENCIES(AllStaticPlugins StelNoGuiLib)
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
############################# External GUI plugin compilation ############# ################## ############################# External GUI plugin compilation ############# ##################
########################################################################### ################## ########################################################################### ##################
IF (GUI_MODE STREQUAL "External") IF (GUI_MODE STREQUAL "External")
SET(EXTERNAL_GUI_SRC_PATH "../../MyGui/" CACHE PATH "The location of the plugin main directory i.e. the one containing the top level CMakeLists .txt") SET(EXTERNAL_GUI_SRC_PATH "../../MyGui/" CACHE PATH "The location of the plugin main directory i.e. the one containing the top level CMakeLists .txt")
ADD_SUBDIRECTORY( ${EXTERNAL_GUI_SRC_PATH} externalGui ) ADD_SUBDIRECTORY( ${EXTERNAL_GUI_SRC_PATH} externalGui )
skipping to change at line 555 skipping to change at line 555
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Oculars/src/${CMAKE_CFG_INTDIR}/lib Oculars.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/Oculars/src/${CMAKE_CFG_INTDIR}/lib Oculars.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_OCULARS) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_OCULARS)
SET(QT_USE_QTSQL TRUE) SET(QT_USE_QTSQL TRUE)
ENDIF() ENDIF()
IF (USE_PLUGIN_TEXTUSERINTERFACE) IF (USE_PLUGIN_TEXTUSERINTERFACE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TextUserInterface/src/${CMAKE_CFG_I NTDIR}/libTextUserInterface.a") SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/TextUserInterface/src/${CMAKE_CFG_I NTDIR}/libTextUserInterface.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TEXTUSERINTERFACE) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_TEXTUSERINTERFACE)
ENDIF() ENDIF()
IF (USE_PLUGIN_SOLARSYSTEMEDITOR)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/SolarSystemEditor/src/${CMAKE_CFG_I
NTDIR}/libSolarSystemEditor.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SOLARSYSTEMEDITOR)
ENDIF()
IF (USE_PLUGIN_TIMEZONECONFIGURATION)
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)
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} "/usr/local/Trolltech/Qt-4.7.0/lib/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()
IF (USE_PLUGIN_VIRGO) IF (USE_PLUGIN_VIRGO)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/VirGO/src/${CMAKE_CFG_INTDIR}/libVir GO.a ${CFITSIO_LIBRARIES}) SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_ LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/VirGO/src/${CMAKE_CFG_INTDIR}/libVir GO.a ${CFITSIO_LIBRARIES})
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_VIRGO) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_VIRGO)
ENDIF() ENDIF()
ENDIF() ENDIF()
skipping to change at line 701 skipping to change at line 711
tests/testRefractionExtinction.hpp tests/testRefractionExtinction.hpp
tests/testRefractionExtinction.cpp tests/testRefractionExtinction.cpp
core/RefractionExtinction.hpp core/RefractionExtinction.hpp
core/RefractionExtinction.cpp) core/RefractionExtinction.cpp)
QT4_WRAP_CPP(tests_testRefractionExtinction_MOC_SRCS tests/testRefractionEx tinction.hpp) QT4_WRAP_CPP(tests_testRefractionExtinction_MOC_SRCS tests/testRefractionEx tinction.hpp)
ADD_EXECUTABLE(testRefractionExtinction EXCLUDE_FROM_ALL ${tests_testRefrac tionExtinction_SRCS} ${tests_testRefractionExtinction_MOC_SRCS}) ADD_EXECUTABLE(testRefractionExtinction EXCLUDE_FROM_ALL ${tests_testRefrac tionExtinction_SRCS} ${tests_testRefractionExtinction_MOC_SRCS})
TARGET_LINK_LIBRARIES(testRefractionExtinction ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testRefractionExtinction ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testRefractionExtinction) ADD_DEPENDENCIES(buildTests testRefractionExtinction)
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_DI RECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testDates WORKING_DIRE CTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelFileMgr WORKIN G_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelFileMgr WORKIN G_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphereGeometry WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphereGeometry WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphericalIndex WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testStelSphericalIndex 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 ./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 ./testStelVertexArray WO RKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testRefractionExtincti on WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testRefractionExtincti on WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_DEPENDENCIES(tests buildTests) ADD_DEPENDENCIES(tests buildTests)
 End of changes. 9 change blocks. 
17 lines changed or deleted 29 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/