CMakeLists.txt   CMakeLists.txt 
skipping to change at line 29 skipping to change at line 29
Telescope.cpp Telescope.cpp
gui/OcularDialog.hpp gui/OcularDialog.hpp
gui/OcularDialog.cpp gui/OcularDialog.cpp
gui/PropertyBasedTableModel.hpp gui/PropertyBasedTableModel.hpp
gui/PropertyBasedTableModel.cpp gui/PropertyBasedTableModel.cpp
gui/OcularsGuiPanel.hpp gui/OcularsGuiPanel.hpp
gui/OcularsGuiPanel.cpp gui/OcularsGuiPanel.cpp
) )
SET(Oculars_RES ../resources/Oculars.qrc) SET(Oculars_RES ../resources/Oculars.qrc)
QT4_ADD_RESOURCES(Oculars_RES_CXX ${Oculars_RES}) QT5_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}) QT5_WRAP_UI(Oculars_UIS_H ${Oculars_UIS})
INCLUDE(${QT_USE_FILE}) SET(extLinkerOption ${OPENGL_LIBRARIES})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ADD_LIBRARY(Oculars-static STATIC ${Oculars_SRCS} ${Oculars_RES_CXX} ${Ocul
${INTL_LIBRARIES}) ars_UIS_H})
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars")
QT5_USE_MODULES(Oculars-static Core Declarative Network OpenGL Widgets)
############### For building the dynamic library ###################### TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption})
IF(BUILD_DYNAMIC_PLUGINS) SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICP
ADD_LIBRARY(Oculars LUGIN")
MODULE ${Oculars_SRCS} ${Oculars_RES_CXX} ${Oculars_UIS_H} ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
)
IF(APPLE)
FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
MARK_AS_ADVANCED(OPENGL_LIBRARY)
SET_TARGET_PROPERTIES(Oculars
PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SU
FFIX ".dylib"
)
ENDIF(APPLE)
IF(WIN32)
SET_TARGET_PROPERTIES(Oculars
PROPERTIES LINK_FLAGS "-Wl,--enable-runtime-pseudo-
reloc -Wl,--allow-multiple-definition"
)
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain)
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Oculars ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Oculars DESTINATION "modules/${PACKAGE}")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Oculars-static
STATIC ${Oculars_SRCS} ${Oculars_RES_CXX} ${Oculars_UIS_H}
)
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars
")
TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption})
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_
STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
ENDIF()
 End of changes. 5 change blocks. 
5 lines changed or deleted 7 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/