CMakeLists.txt   CMakeLists.txt 
skipping to change at line 31 skipping to change at line 31
core/external/glues_stel/source/libtess/render.c core/external/glues_stel/source/libtess/render.c
core/external/glues_stel/source/libtess/render.h core/external/glues_stel/source/libtess/render.h
core/external/glues_stel/source/libtess/sweep.c core/external/glues_stel/source/libtess/sweep.c
core/external/glues_stel/source/libtess/sweep.h core/external/glues_stel/source/libtess/sweep.h
core/external/glues_stel/source/libtess/tess.c core/external/glues_stel/source/libtess/tess.c
core/external/glues_stel/source/libtess/tess.h core/external/glues_stel/source/libtess/tess.h
core/external/glues_stel/source/libtess/tessmono.c core/external/glues_stel/source/libtess/tessmono.c
core/external/glues_stel/source/libtess/tessmono.h core/external/glues_stel/source/libtess/tessmono.h
) )
IF (OPENGL_MODE STREQUAL "Desktop")
SET(gl_lib_SRCS core/external/GLee.c core/external/GLee.h)
ENDIF()
IF(OPENGL_MODE STREQUAL "ES2")
SET(gl_lib_SRCS core/external/GLee.h)
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
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
skipping to change at line 60 skipping to change at line 53
core/StelLocation.cpp core/StelLocation.cpp
core/StelLocationMgr.hpp core/StelLocationMgr.hpp
core/StelLocationMgr.cpp core/StelLocationMgr.cpp
core/StelProjector.cpp core/StelProjector.cpp
core/StelProjector.hpp core/StelProjector.hpp
core/StelProjectorClasses.cpp core/StelProjectorClasses.cpp
core/StelProjectorClasses.hpp core/StelProjectorClasses.hpp
core/StelProjectorType.hpp core/StelProjectorType.hpp
core/StelSkyDrawer.cpp core/StelSkyDrawer.cpp
core/StelSkyDrawer.hpp core/StelSkyDrawer.hpp
core/StelPainter.hpp
core/StelPainter.cpp
core/MultiLevelJsonBase.hpp core/MultiLevelJsonBase.hpp
core/MultiLevelJsonBase.cpp core/MultiLevelJsonBase.cpp
core/StelSkyImageTile.hpp core/StelSkyImageTile.hpp
core/StelSkyImageTile.cpp core/StelSkyImageTile.cpp
core/StelSkyPolygon.hpp core/StelSkyPolygon.hpp
core/StelSkyPolygon.cpp core/StelSkyPolygon.cpp
core/SphericMirrorCalculator.cpp core/SphericMirrorCalculator.cpp
core/SphericMirrorCalculator.hpp core/SphericMirrorCalculator.hpp
core/StelApp.cpp core/StelApp.cpp
core/StelApp.hpp core/StelApp.hpp
skipping to change at line 94 skipping to change at line 85
core/StelObject.cpp core/StelObject.cpp
core/StelObject.hpp core/StelObject.hpp
core/StelObjectMgr.cpp core/StelObjectMgr.cpp
core/StelObjectMgr.hpp core/StelObjectMgr.hpp
core/StelObjectModule.cpp core/StelObjectModule.cpp
core/StelObjectModule.hpp core/StelObjectModule.hpp
core/StelObjectType.hpp core/StelObjectType.hpp
core/StelPluginInterface.hpp core/StelPluginInterface.hpp
core/StelSkyCultureMgr.cpp core/StelSkyCultureMgr.cpp
core/StelSkyCultureMgr.hpp core/StelSkyCultureMgr.hpp
core/StelTextureMgr.cpp
core/StelTextureMgr.hpp
core/StelTexture.cpp
core/StelTexture.hpp
core/StelTextureTypes.hpp
core/StelToneReproducer.cpp core/StelToneReproducer.cpp
core/StelToneReproducer.hpp core/StelToneReproducer.hpp
core/StelSkyLayerMgr.cpp core/StelSkyLayerMgr.cpp
core/StelSkyLayerMgr.hpp core/StelSkyLayerMgr.hpp
core/StelSkyLayer.hpp core/StelSkyLayer.hpp
core/StelSkyLayer.cpp core/StelSkyLayer.cpp
core/StelFader.hpp core/StelFader.hpp
core/StelSphereGeometry.cpp core/StelSphereGeometry.cpp
core/StelSphereGeometry.hpp core/StelSphereGeometry.hpp
core/TriangleIterator.hpp
core/OctahedronPolygon.cpp core/OctahedronPolygon.cpp
core/OctahedronPolygon.hpp core/OctahedronPolygon.hpp
core/StelIniParser.cpp core/StelIniParser.cpp
core/StelIniParser.hpp core/StelIniParser.hpp
core/StelUtils.cpp core/StelUtils.cpp
core/StelUtils.hpp core/StelUtils.hpp
core/StelTranslator.cpp core/StelTranslator.cpp
core/StelTranslator.hpp core/StelTranslator.hpp
core/VecMath.hpp core/VecMath.hpp
core/StelJsonParser.hpp core/StelJsonParser.hpp
core/StelJsonParser.cpp core/StelJsonParser.cpp
core/SimbadSearcher.hpp core/SimbadSearcher.hpp
core/SimbadSearcher.cpp core/SimbadSearcher.cpp
core/StelSphericalIndex.hpp core/StelSphericalIndex.hpp
core/StelSphericalIndex.cpp core/StelSphericalIndex.cpp
core/StelVertexArray.hpp
core/StelVertexArray.cpp
core/StelGuiBase.hpp core/StelGuiBase.hpp
core/StelGuiBase.cpp core/StelGuiBase.cpp
core/StelViewportEffect.hpp core/StelViewportEffect.hpp
core/StelViewportEffect.cpp core/StelViewportEffect.cpp
core/TrailGroup.hpp core/TrailGroup.hpp
core/TrailGroup.cpp core/TrailGroup.cpp
core/RefractionExtinction.hpp core/RefractionExtinction.hpp
core/RefractionExtinction.cpp core/RefractionExtinction.cpp
core/StelLoadingBar.cpp core/StelLoadingBar.cpp
core/StelLoadingBar.hpp core/StelLoadingBar.hpp
core/StelShortcutMgr.hpp
core/StelShortcutMgr.cpp
core/StelShortcutGroup.cpp
core/StelShortcutGroup.hpp
core/Triplet.hpp
core/renderer/StelRendererStatistics.hpp
core/renderer/StelRenderer.cpp
core/renderer/StelRenderer.hpp
core/renderer/StelQGLViewport.cpp
core/renderer/StelQGLViewport.hpp
core/renderer/StelQGLRenderer.cpp
core/renderer/StelQGLRenderer.hpp
core/renderer/StelQGL1Renderer.hpp
core/renderer/StelQGL2Renderer.hpp
core/renderer/StelCircleArcRenderer.hpp
core/renderer/StelGLCompatibility.hpp
core/renderer/StelGLUtilityFunctions.cpp
core/renderer/StelGLUtilityFunctions.hpp
core/renderer/StelIndexBuffer.hpp
core/renderer/StelQGLIndexBuffer.hpp
core/renderer/StelVertexBuffer.hpp
core/renderer/StelVertexBufferBackend.hpp
core/renderer/StelQGLArrayVertexBufferBackend.cpp
core/renderer/StelQGLArrayVertexBufferBackend.hpp
core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp
core/renderer/StelQGLInterleavedArrayVertexBufferBackend.hpp
core/renderer/StelQGL1InterleavedArrayVertexBufferBackend.cpp
core/renderer/StelQGL1InterleavedArrayVertexBufferBackend.hpp
core/renderer/StelQGL2InterleavedArrayVertexBufferBackend.cpp
core/renderer/StelQGL2InterleavedArrayVertexBufferBackend.hpp
core/renderer/StelQGL1ArrayVertexBufferBackend.cpp
core/renderer/StelQGL1ArrayVertexBufferBackend.hpp
core/renderer/StelQGL2ArrayVertexBufferBackend.cpp
core/renderer/StelQGL2ArrayVertexBufferBackend.hpp
core/renderer/StelVertexAttribute.hpp
core/renderer/StelGeometryBuilder.hpp
core/renderer/StelGeometryBuilder.cpp
core/renderer/GenericVertexTypes.hpp
core/renderer/StelTextureParams.hpp
core/renderer/StelTextureNew.cpp
core/renderer/StelTextureNew.hpp
core/renderer/StelTextureBackend.hpp
core/renderer/StelTextureCache.hpp
core/renderer/StelQGLTextureBackend.cpp
core/renderer/StelQGLTextureBackend.hpp
core/renderer/StelTextureLoader.hpp
core/renderer/StelLight.hpp
core/renderer/StelGLSLShader.hpp
core/renderer/StelQGLGLSLShader.hpp
core/renderer/StelQGLGLSLShader.cpp
${gl_lib_SRCS} ${gl_lib_SRCS}
core/external/fixx11h.h core/external/fixx11h.h
core/external/gettext.h core/external/gettext.h
core/external/kfilter/kfilterdev.h core/external/kfilter/kfilterdev.h
core/external/kfilter/kfilterdev.cpp core/external/kfilter/kfilterdev.cpp
core/external/kfilter/kfilterbase.h core/external/kfilter/kfilterbase.h
core/external/kfilter/kfilterbase.cpp core/external/kfilter/kfilterbase.cpp
core/external/kfilter/kgzipfilter.h core/external/kfilter/kgzipfilter.h
skipping to change at line 335 skipping to change at line 378
core/external/kdewin32/unistd.c core/external/kdewin32/unistd.c
) )
ENDIF(WIN32) ENDIF(WIN32)
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)
QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES}) QT4_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
################# compiles moc files ############
# Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(stellarium_MOC_HDRS
core/StelAudioMgr.hpp
core/StelVideoMgr.hpp
core/StelModuleMgr.hpp
core/StelObjectMgr.hpp
core/StelObserver.hpp
core/StelApp.hpp
core/StelLocationMgr.hpp
core/StelCore.hpp
core/StelAppGraphicsWidget.hpp
core/StelTexture.hpp
core/StelMovementMgr.hpp
core/MultiLevelJsonBase.hpp
core/StelSkyImageTile.hpp
core/StelSkyPolygon.hpp
core/StelSkyDrawer.hpp
core/StelSkyLayerMgr.hpp
core/StelSkyLayer.hpp
core/StelSkyCultureMgr.hpp
core/SimbadSearcher.hpp
core/modules/ConstellationMgr.hpp
core/modules/GridLinesMgr.hpp
core/modules/LabelMgr.hpp
core/modules/LandscapeMgr.hpp
core/modules/MeteorMgr.hpp
core/modules/MilkyWay.hpp
core/modules/NebulaMgr.hpp
core/modules/SolarSystem.hpp
core/modules/StarMgr.hpp
StelMainGraphicsView.hpp
StelMainWindow.hpp
)
IF(ENABLE_SCRIPTING)
SET(stellarium_MOC_HDRS ${stellarium_MOC_HDRS}
scripting/ScreenImageMgr.hpp
scripting/StelScriptMgr.hpp
scripting/StelMainScriptAPI.hpp
scripting/StelMainScriptAPIProxy.hpp
)
ENDIF()
# After this call, stellarium_MOC_SRCS = moc_stellarium.cxx
QT4_WRAP_CPP(stellarium_MOC_SRCS ${stellarium_MOC_HDRS})
########################################################################### ################## ########################################################################### ##################
############################# Standard GUI plugin compilation ############# ################## ############################# Standard GUI plugin compilation ############# ##################
########################################################################### ################## ########################################################################### ##################
IF (GUI_MODE STREQUAL "Standard") IF (GUI_MODE STREQUAL "Standard")
SET(stellarium_gui_SRCS SET(stellarium_gui_SRCS
gui/StelGui.hpp gui/StelGui.hpp
gui/StelGui.cpp gui/StelGui.cpp
gui/SkyGui.hpp gui/SkyGui.hpp
gui/SkyGui.cpp gui/SkyGui.cpp
gui/StelStyle.hpp gui/StelStyle.hpp
gui/StelGuiItems.hpp gui/StelGuiItems.hpp
gui/StelGuiItems.cpp gui/StelGuiItems.cpp
gui/HelpDialog.hpp gui/HelpDialog.hpp
gui/HelpDialog.cpp gui/HelpDialog.cpp
gui/ShortcutLineEdit.hpp
gui/ShortcutLineEdit.cpp
gui/ShortcutsDialog.hpp
gui/ShortcutsDialog.cpp
gui/Dialog.hpp gui/Dialog.hpp
gui/Dialog.cpp gui/Dialog.cpp
gui/MapLabel.hpp gui/MapLabel.hpp
gui/MapLabel.cpp gui/MapLabel.cpp
gui/AngleSpinBox.hpp gui/AngleSpinBox.hpp
gui/AngleSpinBox.cpp gui/AngleSpinBox.cpp
gui/LocationDialog.hpp gui/LocationDialog.hpp
gui/LocationDialog.cpp gui/LocationDialog.cpp
gui/DateTimeDialog.hpp gui/DateTimeDialog.hpp
gui/DateTimeDialog.cpp gui/DateTimeDialog.cpp
skipping to change at line 420 skipping to change at line 419
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/StelDialog.hpp gui/StelDialog.hpp
gui/StelDialog.cpp) gui/StelDialog.cpp)
################# compiles GUI moc files ############
SET(stellarium_gui_MOC_HDRS
gui/StelGui.hpp
gui/SkyGui.hpp
gui/StelGuiItems.hpp
gui/HelpDialog.hpp
gui/Dialog.hpp
gui/MapLabel.hpp
gui/AngleSpinBox.hpp
gui/LocationDialog.hpp
gui/DateTimeDialog.hpp
gui/ViewDialog.hpp
gui/SearchDialog.hpp
gui/ConfigurationDialog.hpp
gui/AddRemoveLandscapesDialog.hpp
gui/AtmosphereDialog.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/shortcutsDialog.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/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}
gui/ScriptConsole.hpp
gui/StelScriptSyntaxHighlighter.hpp)
SET(stellarium_UIS ${stellarium_UIS} SET(stellarium_UIS ${stellarium_UIS}
gui/scriptConsole.ui) gui/scriptConsole.ui)
ENDIF(ENABLE_SCRIPT_CONSOLE) ENDIF(ENABLE_SCRIPT_CONSOLE)
QT4_WRAP_UI(stellarium_UIS_H ${stellarium_UIS}) QT4_WRAP_UI(stellarium_UIS_H ${stellarium_UIS})
# After this call, stellarium_gui_MOC_SRCS = moc_stellarium_gui.cxx
QT4_WRAP_CPP(stellarium_gui_MOC_SRCS ${stellarium_gui_MOC_HDRS})
# 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_UI S_H} ${stellarium_gui_RES_CXX})
TARGET_LINK_LIBRARIES(StelGuiLib ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(StelGuiLib ${StelMain} ${extLinkerOption})
SET_TARGET_PROPERTIES(StelGuiLib PROPERTIES COMPILE_FLAGS "-DQT_STAT ICPLUGIN") SET_TARGET_PROPERTIES(StelGuiLib PROPERTIES COMPILE_FLAGS "-DQT_STAT ICPLUGIN")
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 ADD_LIBRARY(StelNoGuiLib STATIC ${stellarium_nogui_SRCS})
noGui/StelNoGui.hpp)
QT4_WRAP_CPP(stellarium_nogui_MOC_SRCS ${stellarium_nogui_MOC_HDRS})
ADD_LIBRARY(StelNoGuiLib STATIC ${stellarium_nogui_SRCS} ${stellariu
m_nogui_MOC_SRCS})
TARGET_LINK_LIBRARIES(StelNoGuiLib ${extLinkerOption}) TARGET_LINK_LIBRARIES(StelNoGuiLib ${extLinkerOption})
SET_TARGET_PROPERTIES(StelNoGuiLib PROPERTIES COMPILE_FLAGS "-DQT_ST ATICPLUGIN") SET_TARGET_PROPERTIES(StelNoGuiLib PROPERTIES COMPILE_FLAGS "-DQT_ST ATICPLUGIN")
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")
skipping to change at line 519 skipping to change at line 492
########################################################################### #################### ########################################################################### ####################
################## 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_SIMPLEDRAWLINE)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_
LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/SimpleDrawLine/src/${CMAKE_CFG_INTD
IR}/libSimpleDrawLine.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_SIMPLEDRAWLINE)
ENDIF()
IF (USE_PLUGIN_OBSERVABILITY) 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") 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) ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_OBSERVABILITY)
ENDIF() 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()
skipping to change at line 608 skipping to change at line 586
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()
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()
IF (USE_PLUGIN_RENDERERSTATISTICS)
SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGIN
S_LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/RendererStatistics/src/${CMAKE_CF
G_INTDIR}/libRendererStatistics.a")
ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_RENDERERSTATISTICS)
ENDIF()
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
################################ Build main program ####################### ################## ################################ Build main program ####################### ##################
########################################################################### ################## ########################################################################### ##################
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()
skipping to change at line 632 skipping to change at line 615
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(OUTPUT ${CMAKE_BINARY_DIR}/stellarium-rc.o 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 COMMAND ${RC_COMPILER_PATH} ${CMAKE_SOURCE_DIR}/data /stellarium.rc ${CMAKE_BINARY_DIR}/stellarium-rc.o
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data)
SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINARY_DIR}/stel larium-rc.o) SET(stellarium_exe_SRCS ${stellarium_exe_SRCS} ${CMAKE_BINARY_DIR}/stel larium-rc.o)
ENDIF(RC_COMPILER_PATH) ENDIF(RC_COMPILER_PATH)
ENDIF(WIN32 AND ENABLE_WINDOWS_EXE_ICON) 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_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_RES_CXX} ${s tellarium_exe_SRCS})
TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATIC_PL UGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATIC_PL UGINS_LIBRARIES})
IF(APPLE) IF(APPLE)
# SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -dylib_file /Sys tem/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/S ystem/Library/Frameworks/works/OpenGL.framework/Versions/A/Libraries/libGL. dylib -framework Cocoa -framework QtDeclarative") # SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -dylib_file /Sys tem/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/S ystem/Library/Frameworks/works/OpenGL.framework/Versions/A/Libraries/libGL. dylib -framework Cocoa -framework QtDeclarative")
SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framework Cocoa - framework OpenGL") SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framework Cocoa - framework OpenGL")
ENDIF() ENDIF()
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(extLinkerOptionTest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_Q TTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} ${Z LIB_LIBRARIES}) SET(extLinkerOptionTest ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY} ${OPENGL_LIBRA RIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES} ${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
core/StelUtils.cpp core/StelUtils.cpp
core/StelUtils.hpp core/StelUtils.hpp
tests/testDates.cpp) tests/testDates.cpp)
QT4_WRAP_CPP(testDates_MOC_SRCS tests/testDates.hpp) ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS})
ADD_EXECUTABLE(testDates EXCLUDE_FROM_ALL ${tests_testDates_SRCS} ${testDat
es_MOC_SRCS})
TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testDates ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDates) ADD_DEPENDENCIES(buildTests testDates)
SET(tests_testStelFileMgr_SRCS SET(tests_testStelFileMgr_SRCS
core/StelFileMgr.cpp core/StelFileMgr.cpp
core/StelFileMgr.hpp core/StelFileMgr.hpp
tests/testStelFileMgr.cpp) tests/testStelFileMgr.cpp)
QT4_WRAP_CPP(testStelFileMgr_MOC_SRCS tests/testStelFileMgr.hpp) ADD_EXECUTABLE(testStelFileMgr EXCLUDE_FROM_ALL ${tests_testStelFileMgr_SRC
ADD_EXECUTABLE(testStelFileMgr EXCLUDE_FROM_ALL ${tests_testStelFileMgr_SRC S})
S} ${testStelFileMgr_MOC_SRCS})
TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelFileMgr ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelFileMgr) ADD_DEPENDENCIES(buildTests 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.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
${glues_lib_SRCS}) ${glues_lib_SRCS})
QT4_WRAP_CPP(testStelSphereGeometry_MOC_SRCS tests/testStelSphereGeometry.h ADD_EXECUTABLE(testStelSphereGeometry EXCLUDE_FROM_ALL ${tests_testStelSphe
pp) reGeometry_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
core/StelSphericalIndex.cpp core/StelSphericalIndex.cpp
core/StelSphereGeometry.hpp core/StelSphereGeometry.hpp
core/StelSphereGeometry.cpp core/StelSphereGeometry.cpp
core/StelVertexArray.hpp
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
${glues_lib_SRCS}) ${glues_lib_SRCS})
QT4_WRAP_CPP(tests_testStelSphericalIndex_MOC_SRCS tests/testStelSphericalI ADD_EXECUTABLE(testStelSphericalIndex EXCLUDE_FROM_ALL ${tests_testStelSphe
ndex.hpp) ricalIndex_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
core/StelJsonParser.cpp) core/StelJsonParser.cpp)
QT4_WRAP_CPP(tests_testStelJsonParser_MOC_SRCS tests/testStelJsonParser.hpp ADD_EXECUTABLE(testStelJsonParser EXCLUDE_FROM_ALL ${tests_testStelJsonPars
) er_SRCS})
ADD_EXECUTABLE(testStelJsonParser EXCLUDE_FROM_ALL ${tests_testStelJsonPars
er_SRCS} ${tests_testStelJsonParser_MOC_SRCS})
TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest}) TARGET_LINK_LIBRARIES(testStelJsonParser ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelJsonParser) ADD_DEPENDENCIES(buildTests testStelJsonParser)
SET(tests_testStelVertexArray_SRCS SET(tests_testStelVertexBuffer_SRCS
tests/testStelVertexArray.hpp ${glues_lib_SRCS}
tests/testStelVertexArray.cpp tests/testStelVertexBuffer.hpp
core/StelVertexArray.hpp) tests/testStelVertexBuffer.cpp
QT4_WRAP_CPP(tests_testStelVertexArray_MOC_SRCS tests/testStelVertexArray.h core/StelFileMgr.cpp
pp) core/StelSphereGeometry.cpp
ADD_EXECUTABLE(testStelVertexArray EXCLUDE_FROM_ALL ${tests_testStelVertexA core/StelSphereGeometry.hpp
rray_SRCS} ${tests_testStelVertexArray_MOC_SRCS}) core/StelProjector.cpp
TARGET_LINK_LIBRARIES(testStelVertexArray ${extLinkerOptionTest}) core/StelProjector.hpp
ADD_DEPENDENCIES(buildTests testStelVertexArray) core/OctahedronPolygon.cpp
core/OctahedronPolygon.hpp
# core/StelJsonParser.cpp
# Temporary disable RefractionExtinction test because now we have two class core/StelJsonParser.hpp
es: Refraction and Extinction core/StelUtils.cpp
# core/StelUtils.hpp
#SET(tests_testRefractionExtinction_SRCS core/StelTranslator.cpp
# tests/testRefractionExtinction.hpp core/StelTranslator.hpp
# tests/testRefractionExtinction.cpp core/renderer/StelVertexBuffer.hpp
# core/RefractionExtinction.hpp core/renderer/StelVertexBufferBackend.hpp
# core/RefractionExtinction.cpp) core/renderer/StelGLUtilityFunctions.cpp
#QT4_WRAP_CPP(tests_testRefractionExtinction_MOC_SRCS tests/testRefractionE core/renderer/StelGLSLShader.hpp
xtinction.hpp) core/renderer/StelQGLGLSLShader.cpp
#ADD_EXECUTABLE(testRefractionExtinction EXCLUDE_FROM_ALL ${tests_testRefra core/renderer/StelQGLGLSLShader.hpp
ctionExtinction_SRCS} ${tests_testRefractionExtinction_MOC_SRCS}) core/renderer/StelQGLArrayVertexBufferBackend.cpp
#TARGET_LINK_LIBRARIES(testRefractionExtinction ${extLinkerOptionTest}) core/renderer/StelQGLArrayVertexBufferBackend.hpp
#ADD_DEPENDENCIES(buildTests testRefractionExtinction) core/renderer/StelQGL2ArrayVertexBufferBackend.cpp
core/renderer/StelQGL2ArrayVertexBufferBackend.hpp)
ADD_EXECUTABLE(testStelVertexBuffer EXCLUDE_FROM_ALL ${tests_testStelVertex
Buffer_SRCS})
TARGET_LINK_LIBRARIES(testStelVertexBuffer ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testStelVertexBuffer)
SET(tests_testDeltaT_SRCS
tests/testDeltaT.hpp
tests/testDeltaT.cpp
core/StelUtils.cpp
core/StelUtils.hpp)
ADD_EXECUTABLE(testDeltaT EXCLUDE_FROM_ALL ${tests_testDeltaT_SRCS})
TARGET_LINK_LIBRARIES(testDeltaT ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testDeltaT)
SET(tests_testConversions_SRCS
core/StelUtils.cpp
core/StelUtils.hpp
tests/testConversions.hpp
tests/testConversions.cpp)
ADD_EXECUTABLE(testConversions EXCLUDE_FROM_ALL ${tests_testConversions_SRC
S})
TARGET_LINK_LIBRARIES(testConversions ${extLinkerOptionTest})
ADD_DEPENDENCIES(buildTests testConversions)
######SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRA
RIES} ${INTL_LIBRARIES} ${ZLIB_LIBRARIES})
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 CTORY ${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 ./testStelVertexBuffer W ORKING_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 ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testDeltaT WORKING_DIR
RKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) ECTORY ${CMAKE_BINARY_DIR}/src/)
# ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testRefractionExtinc ADD_CUSTOM_COMMAND(TARGET tests POST_BUILD COMMAND ./testConversions WORKIN
tion WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/) G_DIRECTORY ${CMAKE_BINARY_DIR}/src/)
ADD_DEPENDENCIES(tests buildTests) ADD_DEPENDENCIES(tests buildTests)
 End of changes. 29 change blocks. 
149 lines changed or deleted 150 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/