CMakeLists.txt   CMakeLists.txt 
skipping to change at line 19 skipping to change at line 19
SET(TelescopeControl_SRCS SET(TelescopeControl_SRCS
TelescopeControlGlobals.hpp TelescopeControlGlobals.hpp
clients/TelescopeClient.hpp clients/TelescopeClient.hpp
clients/TelescopeClient.cpp clients/TelescopeClient.cpp
clients/TelescopeClientDirectLx200.hpp clients/TelescopeClientDirectLx200.hpp
clients/TelescopeClientDirectLx200.cpp clients/TelescopeClientDirectLx200.cpp
clients/TelescopeClientDirectNexStar.hpp clients/TelescopeClientDirectNexStar.hpp
clients/TelescopeClientDirectNexStar.cpp clients/TelescopeClientDirectNexStar.cpp
TelescopeControl.hpp TelescopeControl.hpp
TelescopeControl.cpp TelescopeControl.cpp
gui/SlewDialog.hpp
gui/SlewDialog.cpp
gui/TelescopeDialog.hpp gui/TelescopeDialog.hpp
gui/TelescopeDialog.cpp gui/TelescopeDialog.cpp
gui/TelescopeConfigurationDialog.hpp gui/TelescopeConfigurationDialog.hpp
gui/TelescopeConfigurationDialog.cpp gui/TelescopeConfigurationDialog.cpp
gui/StelDialogTelescopeControl.hpp gui/StelDialogTelescopeControl.hpp
gui/StelDialogTelescopeControl.cpp gui/StelDialogTelescopeControl.cpp
servers/LogFile.hpp servers/LogFile.hpp
servers/LogFile.cpp servers/LogFile.cpp
servers/Socket.hpp servers/Socket.hpp
servers/Socket.cpp servers/Socket.cpp
skipping to change at line 47 skipping to change at line 49
servers/Lx200Command.hpp servers/Lx200Command.hpp
servers/Lx200Command.cpp servers/Lx200Command.cpp
servers/NexStarConnection.hpp servers/NexStarConnection.hpp
servers/NexStarConnection.cpp servers/NexStarConnection.cpp
servers/NexStarCommand.hpp servers/NexStarCommand.hpp
servers/NexStarCommand.cpp servers/NexStarCommand.cpp
) )
# Add here all the .ui files # Add here all the .ui files
SET(TelescopeControl_UIS SET(TelescopeControl_UIS
gui/slewDialog.ui
gui/telescopeDialog.ui gui/telescopeDialog.ui
gui/telescopeConfigurationDialog.ui) gui/telescopeConfigurationDialog.ui)
QT4_WRAP_UI(TelescopeControl_UIS_H ${TelescopeControl_UIS}) QT4_WRAP_UI(TelescopeControl_UIS_H ${TelescopeControl_UIS})
# Compile the resource files # Compile the resource files
SET(TelescopeControl_RES ../TelescopeControl.qrc) SET(TelescopeControl_RES ../resources/TelescopeControl.qrc)
QT4_ADD_RESOURCES(TelescopeControl_RES_CXX ${TelescopeControl_RES}) QT4_ADD_RESOURCES(TelescopeControl_RES_CXX ${TelescopeControl_RES})
# 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(TelescopeControl_MOC_HDRS SET(TelescopeControl_MOC_HDRS
gui/StelDialogTelescopeControl.hpp gui/StelDialogTelescopeControl.hpp
gui/TelescopeConfigurationDialog.hpp gui/TelescopeConfigurationDialog.hpp
gui/TelescopeDialog.hpp gui/TelescopeDialog.hpp
gui/SlewDialog.hpp
TelescopeControl.hpp TelescopeControl.hpp
clients/TelescopeClient.hpp clients/TelescopeClient.hpp
clients/TelescopeClientDirectLx200.hpp clients/TelescopeClientDirectLx200.hpp
clients/TelescopeClientDirectNexStar.hpp clients/TelescopeClientDirectNexStar.hpp
) )
# After this call, TelescopeControl_MOC_SRCS = moc_TelescopeControl.cxx # After this call, TelescopeControl_MOC_SRCS = moc_TelescopeControl.cxx
QT4_WRAP_CPP(TelescopeControl_MOC_SRCS ${TelescopeControl_MOC_HDRS}) QT4_WRAP_CPP(TelescopeControl_MOC_SRCS ${TelescopeControl_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
skipping to change at line 100 skipping to change at line 104
TARGET_LINK_LIBRARIES(TelescopeControl ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(TelescopeControl ${StelMain} ${extLinkerOption})
INSTALL(TARGETS TelescopeControl DESTINATION "modules/TelescopeControl") INSTALL(TARGETS TelescopeControl DESTINATION "modules/TelescopeControl")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(TelescopeControl-static STATIC ${TelescopeControl_SRCS} ${Tele scopeControl_MOC_SRCS} ${TelescopeControl_RES_CXX} ${TelescopeControl_UIS_H }) ADD_LIBRARY(TelescopeControl-static STATIC ${TelescopeControl_SRCS} ${Tele scopeControl_MOC_SRCS} ${TelescopeControl_RES_CXX} ${TelescopeControl_UIS_H })
SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "Tele scopeControl") SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "Tele scopeControl")
TARGET_LINK_LIBRARIES(TelescopeControl-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(TelescopeControl-static ${extLinkerOption})
SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-f IF(WIN32)
PIC -DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FL
AGS "-DQT_STATICPLUGIN")
ELSE()
SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FL
AGS "-fPIC -DQT_STATICPLUGIN")
ENDIF()
ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static) ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static)
ENDIF() ENDIF()
 End of changes. 5 change blocks. 
3 lines changed or deleted 12 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/