CMakeLists.txt   CMakeLists.txt 
skipping to change at line 23 skipping to change at line 23
Supernova.hpp Supernova.hpp
Supernova.cpp Supernova.cpp
gui/SupernovaeDialog.hpp gui/SupernovaeDialog.hpp
gui/SupernovaeDialog.cpp gui/SupernovaeDialog.cpp
) )
SET(SupernovaeDialog_UIS SET(SupernovaeDialog_UIS
gui/supernovaeDialog.ui gui/supernovaeDialog.ui
) )
QT4_WRAP_UI(SupernovaeDialog_UIS_H ${SupernovaeDialog_UIS}) QT5_WRAP_UI(SupernovaeDialog_UIS_H ${SupernovaeDialog_UIS})
SET(Supernovae_RES ../resources/Supernovae.qrc) SET(Supernovae_RES ../resources/Supernovae.qrc)
QT4_ADD_RESOURCES(Supernovae_RES_CXX ${Supernovae_RES}) QT5_ADD_RESOURCES(Supernovae_RES_CXX ${Supernovae_RES})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
############### For building the dynamic library ###################### ADD_LIBRARY(Supernovae-static STATIC ${Supernovae_SRCS} ${Supernovae_RES_CX
IF(BUILD_DYNAMIC_PLUGINS) X} ${SupernovaeDialog_UIS_H})
ADD_LIBRARY(Supernovae MODULE ${Supernovae_SRCS} ${Supernovae_RES_CX QT5_USE_MODULES(Supernovae-static Core Declarative Network)
X} ${SupernovaeDialog_UIS_H}) SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supernovae"
IF(APPLE) )
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) TARGET_LINK_LIBRARIES(Supernovae-static ${extLinkerOption})
MARK_AS_ADVANCED(OPENGL_LIBRARY) SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-DQT_STAT
SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-und ICPLUGIN")
efined dynamic_lookup" SUFFIX ".dylib") ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static)
ENDIF()
IF(WIN32)
SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-Wl
,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Supernovae ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Supernovae DESTINATION "modules/Supernovae")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Supernovae-static STATIC ${Supernovae_SRCS} ${Supernovae
_RES_CXX} ${SupernovaeDialog_UIS_H})
SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supe
rnovae")
TARGET_LINK_LIBRARIES(Supernovae-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-D
QT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static)
ENDIF()
 End of changes. 4 change blocks. 
3 lines changed or deleted 3 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/