CMakeLists.txt   CMakeLists.txt 
skipping to change at line 28 skipping to change at line 28
SET(SupernovaeDialog_UIS SET(SupernovaeDialog_UIS
gui/supernovaeDialog.ui gui/supernovaeDialog.ui
) )
QT4_WRAP_UI(SupernovaeDialog_UIS_H ${SupernovaeDialog_UIS}) QT4_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}) QT4_ADD_RESOURCES(Supernovae_RES_CXX ${Supernovae_RES})
SET(Supernovae_MOC_HDRS
Supernovae.hpp
gui/SupernovaeDialog.hpp
)
QT4_WRAP_CPP(Supernovae_MOC_SRCS ${Supernovae_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_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(Supernovae MODULE ${Supernovae_SRCS} ${Supernovae_MOC_SR CS} ${Supernovae_RES_CXX} ${SupernovaeDialog_UIS_H}) ADD_LIBRARY(Supernovae MODULE ${Supernovae_SRCS} ${Supernovae_RES_CX X} ${SupernovaeDialog_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(Supernovae PROPERTIES LINK_FLAGS "-und efined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-und efined dynamic_lookup" SUFFIX ".dylib")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-ena ble-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-ena ble-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
ELSE(WIN32) ELSE(WIN32)
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Supernovae ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Supernovae ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Supernovae DESTINATION "modules/Supernovae") INSTALL(TARGETS Supernovae DESTINATION "modules/Supernovae")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Supernovae-static STATIC ${Supernovae_SRCS} ${Supernovae _MOC_SRCS} ${Supernovae_RES_CXX} ${SupernovaeDialog_UIS_H}) ADD_LIBRARY(Supernovae-static STATIC ${Supernovae_SRCS} ${Supernovae _RES_CXX} ${SupernovaeDialog_UIS_H})
SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supe rnovae") SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supe rnovae")
TARGET_LINK_LIBRARIES(Supernovae-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(Supernovae-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-D QT_STATICPLUGIN") SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-D QT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static) ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
9 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/