CMakeLists.txt   CMakeLists.txt 
skipping to change at line 20 skipping to change at line 20
CCD.hpp CCD.hpp
CCD.cpp CCD.cpp
Ocular.hpp Ocular.hpp
Ocular.cpp Ocular.cpp
Oculars.hpp Oculars.hpp
Oculars.cpp Oculars.cpp
Telescope.hpp Telescope.hpp
Telescope.cpp Telescope.cpp
gui/OcularDialog.hpp gui/OcularDialog.hpp
gui/OcularDialog.cpp gui/OcularDialog.cpp
gui/PropertyBasedTableModel.hpp
gui/PropertyBasedTableModel.cpp
gui/StelDialogOculars.hpp gui/StelDialogOculars.hpp
gui/StelDialogOculars.cpp gui/StelDialogOculars.cpp
) )
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
skipping to change at line 41 skipping to change at line 43
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 # 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(Oculars_MOC_HDRS SET(Oculars_MOC_HDRS
CCD.hpp CCD.hpp
Ocular.hpp Ocular.hpp
Oculars.hpp Oculars.hpp
Telescope.hpp Telescope.hpp
gui/OcularDialog.hpp gui/OcularDialog.hpp
gui/PropertyBasedTableModel.hpp
gui/StelDialogOculars.hpp gui/StelDialogOculars.hpp
) )
# After this call, Oculars_MOC_SRCS = moc_Oculars.cxx # After this call, Oculars_MOC_SRCS = moc_Oculars.cxx
QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS}) QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS})
SET(QT_USE_QTSQL TRUE)
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_MOC_SRCS} ${Oculars_RES_CXX } ${Oculars_UIS_H}
) )
skipping to change at line 86 skipping to change at line 88
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_MOC_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})
IF(WIN32) SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAG STATICPLUGIN")
S "-DQT_STATICPLUGIN")
ELSE()
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAG
S "-fPIC -DQT_STATICPLUGIN")
ENDIF()
ADD_DEPENDENCIES(AllStaticPlugins Oculars-static) ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
ENDIF() ENDIF()
 End of changes. 4 change blocks. 
8 lines changed or deleted 5 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/