CMakeLists.txt   CMakeLists.txt 
skipping to change at line 35 skipping to change at line 35
SET(Oculars_RES ../resources/Oculars.qrc) SET(Oculars_RES ../resources/Oculars.qrc)
QT4_ADD_RESOURCES(Oculars_RES_CXX ${Oculars_RES}) QT4_ADD_RESOURCES(Oculars_RES_CXX ${Oculars_RES})
################# compiles .ui files ############ ################# compiles .ui files ############
SET(Oculars_UIS SET(Oculars_UIS
gui/ocularDialog.ui gui/ocularDialog.ui
) )
QT4_WRAP_UI(Oculars_UIS_H ${Oculars_UIS}) QT4_WRAP_UI(Oculars_UIS_H ${Oculars_UIS})
# Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(Oculars_MOC_HDRS
CCD.hpp
Ocular.hpp
Oculars.hpp
Telescope.hpp
gui/OcularDialog.hpp
gui/PropertyBasedTableModel.hpp
gui/OcularsGuiPanel.hpp
)
# After this call, Oculars_MOC_SRCS = moc_Oculars.cxx
QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS})
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
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(Oculars ADD_LIBRARY(Oculars
MODULE ${Oculars_SRCS} ${Oculars_MOC_SRCS} ${Oculars_RES_CXX } ${Oculars_UIS_H} MODULE ${Oculars_SRCS} ${Oculars_RES_CXX} ${Oculars_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(Oculars SET_TARGET_PROPERTIES(Oculars
PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SU FFIX ".dylib" PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SU FFIX ".dylib"
) )
ENDIF(APPLE) ENDIF(APPLE)
skipping to change at line 84 skipping to change at line 69
SET(StelMain) SET(StelMain)
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Oculars ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Oculars ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Oculars DESTINATION "modules/${PACKAGE}") INSTALL(TARGETS Oculars DESTINATION "modules/${PACKAGE}")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Oculars-static ADD_LIBRARY(Oculars-static
STATIC ${Oculars_SRCS} ${Oculars_MOC_SRCS} ${Oculars_RES_CXX } ${Oculars_UIS_H} STATIC ${Oculars_SRCS} ${Oculars_RES_CXX} ${Oculars_UIS_H}
) )
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars ") SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars ")
TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption})
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN") SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Oculars-static) ADD_DEPENDENCIES(AllStaticPlugins Oculars-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/