CMakeLists.txt   CMakeLists.txt 
skipping to change at line 285 skipping to change at line 285
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)
QT5_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES}) QT5_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
########################################################################### ################## ########################################################################### ##################
############################# Standard GUI plugin compilation ############# ################## ############################# Standard GUI plugin compilation ############# ##################
########################################################################### ################## ########################################################################### ##################
IF(GUI_MODE STREQUAL "Standard") IF(STELLARIUM_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
skipping to change at line 370 skipping to change at line 370
SET(stellarium_gui_RES ${CMAKE_SOURCE_DIR}/data/gui/guiRes.qrc) SET(stellarium_gui_RES ${CMAKE_SOURCE_DIR}/data/gui/guiRes.qrc)
QT5_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES}) QT5_ADD_RESOURCES(stellarium_gui_RES_CXX ${stellarium_gui_RES})
SET(extLinkerOption ${extLinkerOption} ${QT_QTSCRIPT_LIBRARY} ${OPENGL _LIBRARIES}) SET(extLinkerOption ${extLinkerOption} ${QT_QTSCRIPT_LIBRARY} ${OPENGL _LIBRARIES})
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} ${stellarium_gui_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX}) SET(stellarium_lib_SRCS ${stellarium_lib_SRCS} ${stellarium_gui_SRCS} ${stellarium_UIS_H} ${stellarium_gui_RES_CXX})
ENDIF() ENDIF()
########################################################################### ################## ########################################################################### ##################
################################ No GUI plugin compilation ################ ################## ################################ No GUI plugin compilation ################ ##################
########################################################################### ################## ########################################################################### ##################
IF (GUI_MODE STREQUAL "None") IF (STELLARIUM_GUI_MODE STREQUAL "None")
ADD_DEFINITIONS(-DNO_GUI) ADD_DEFINITIONS(-DNO_GUI)
ENDIF() ENDIF()
########################################################################### #################### ########################################################################### ####################
################## Static plugins need to be known by the file StelApp.cpp at compilation time ################## Static plugins need to be known by the file StelApp.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.
### demo plugins ### ### demo plugins ###
skipping to change at line 431 skipping to change at line 431
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(GENERATE_STELMAINLIB) IF(GENERATE_STELMAINLIB)
ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_RES_CX X}) ADD_LIBRARY(stelMain SHARED ${stellarium_lib_SRCS} ${stellarium_RES_CX X})
TARGET_LINK_LIBRARIES(stelMain ${extLinkerOption} ${STELLARIUM_STATIC_ PLUGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stelMain ${extLinkerOption} ${STELLARIUM_STATIC_ PLUGINS_LIBRARIES})
QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Script Wid gets) QT5_USE_MODULES(stelMain Core Concurrent Gui Network OpenGL Script Wid gets)
IF(ENABLE_SOUND) IF(ENABLE_SOUND)
QT5_USE_MODULES(stelMain Multimedia) QT5_USE_MODULES(stelMain Multimedia)
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stelMain SerialPort)
ENDIF()
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 } stelMain ${extLinkerOption}) TARGET_LINK_LIBRARIES(stellarium ${STELLARIUM_STATIC_PLUGINS_LIBRARIES } stelMain ${extLinkerOption})
ELSE() ELSE()
ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_RES_CXX} ${stellarium_exe_SRCS}) ADD_EXECUTABLE(stellarium ${stellarium_lib_SRCS} ${stellarium_RES_CXX} ${stellarium_exe_SRCS})
TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATI C_PLUGINS_LIBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${extLinkerOption} ${STELLARIUM_STATI C_PLUGINS_LIBRARIES})
# This will add the ANGLE lib if the Qt version supports it. # This will add the ANGLE lib if the Qt version supports it.
TARGET_LINK_LIBRARIES(stellarium ${Qt5Gui_LIBRARIES} ${Qt5Gui_OPENGL_L IBRARIES}) TARGET_LINK_LIBRARIES(stellarium ${Qt5Gui_LIBRARIES} ${Qt5Gui_OPENGL_L IBRARIES})
QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Script W idgets) QT5_USE_MODULES(stellarium Core Concurrent Gui Network OpenGL Script W idgets SerialPort)
IF(ENABLE_SOUND) IF(ENABLE_SOUND)
QT5_USE_MODULES(stellarium Multimedia) QT5_USE_MODULES(stellarium Multimedia)
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL)
QT5_USE_MODULES(stellarium SerialPort)
ENDIF()
IF(APPLE) IF(APPLE)
SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framewo rk Cocoa -framework OpenGL") SET_TARGET_PROPERTIES(stellarium PROPERTIES LINK_FLAGS " -framewo rk Cocoa -framework OpenGL")
ENDIF() ENDIF()
ENDIF() ENDIF()
ADD_DEPENDENCIES(stellarium AllStaticPlugins) ADD_DEPENDENCIES(stellarium AllStaticPlugins)
# Adding manifest
IF(MSVC)
ADD_CUSTOM_COMMAND(TARGET stellarium
POST_BUILD
COMMAND "mt.exe" -nologo -manifest ${CMAKE_SOURCE_DIR}/stellarium
.exe.manifest -outputresource:$<TARGET_FILE:stellarium>
COMMENT "Adding manifest..."
VERBATIM
)
ENDIF(MSVC)
INSTALL(TARGETS stellarium DESTINATION bin) INSTALL(TARGETS stellarium DESTINATION bin)
########################################################################### ################## ########################################################################### ##################
################################## Build unit tests ####################### ################## ################################## Build unit tests ####################### ##################
########################################################################### ################## ########################################################################### ##################
SET(STELLARIUM_TESTS) SET(STELLARIUM_TESTS)
MACRO(ADD_TEST NAME) MACRO(ADD_TEST NAME)
SET(STELLARIUM_TESTS ${STELLARIUM_TESTS} ${NAME}) SET(STELLARIUM_TESTS ${STELLARIUM_TESTS} ${NAME})
ENDMACRO() ENDMACRO()
 End of changes. 6 change blocks. 
3 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/