CMakeLists.txt   CMakeLists.txt 
skipping to change at line 59 skipping to change at line 59
gui/slewDialog.ui 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 ../resources/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
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(TelescopeControl_MOC_HDRS
gui/TelescopeConfigurationDialog.hpp
gui/TelescopeDialog.hpp
gui/SlewDialog.hpp
TelescopeControl.hpp
clients/TelescopeClient.hpp
clients/TelescopeClientDirectLx200.hpp
clients/TelescopeClientDirectNexStar.hpp
)
# After this call, TelescopeControl_MOC_SRCS = moc_TelescopeControl.cxx
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})
############### For building the dynamic library ###################### ############### For building the dynamic library ######################
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(TelescopeControl MODULE ${TelescopeControl_SRCS} ${TelescopeCo ntrol_MOC_SRCS} ${TelescopeControl_RES_CXX} ${TelescopeControl_UIS_H}) ADD_LIBRARY(TelescopeControl MODULE ${TelescopeControl_SRCS} ${TelescopeCo ntrol_RES_CXX} ${TelescopeControl_UIS_H})
IF(APPLE) IF(APPLE)
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
MARK_AS_ADVANCED(OPENGL_LIBRARY) MARK_AS_ADVANCED(OPENGL_LIBRARY)
SET_TARGET_PROPERTIES(TelescopeControl PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(TelescopeControl PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE) ENDIF(APPLE)
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(TelescopeControl PROPERTIES LINK_FLAGS "-enable-run time-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(TelescopeControl PROPERTIES LINK_FLAGS "-enable-run time-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
skipping to change at line 100 skipping to change at line 85
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
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_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 "-D QT_STATICPLUGIN") SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-D QT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static) ADD_DEPENDENCIES(AllStaticPlugins TelescopeControl-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
17 lines changed or deleted 2 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/