CMakeLists.txt   CMakeLists.txt 
skipping to change at line 28 skipping to change at line 28
SET(PulsarsDialog_UIS SET(PulsarsDialog_UIS
gui/pulsarsDialog.ui gui/pulsarsDialog.ui
) )
QT4_WRAP_UI(PulsarsDialog_UIS_H ${PulsarsDialog_UIS}) QT4_WRAP_UI(PulsarsDialog_UIS_H ${PulsarsDialog_UIS})
SET(Pulsars_RES ../resources/Pulsars.qrc) SET(Pulsars_RES ../resources/Pulsars.qrc)
QT4_ADD_RESOURCES(Pulsars_RES_CXX ${Pulsars_RES}) QT4_ADD_RESOURCES(Pulsars_RES_CXX ${Pulsars_RES})
SET(Pulsars_MOC_HDRS
Pulsars.hpp
gui/PulsarsDialog.hpp
)
QT4_WRAP_CPP(Pulsars_MOC_SRCS ${Pulsars_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(Pulsars MODULE ${Pulsars_SRCS} ${Pulsars_MOC_SRCS} ${Pul sars_RES_CXX} ${PulsarsDialog_UIS_H}) ADD_LIBRARY(Pulsars MODULE ${Pulsars_SRCS} ${Pulsars_RES_CXX} ${Puls arsDialog_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(Pulsars PROPERTIES LINK_FLAGS "-undefi ned dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(Pulsars PROPERTIES LINK_FLAGS "-undefi ned dynamic_lookup" SUFFIX ".dylib")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(Pulsars PROPERTIES LINK_FLAGS "-enable -runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(Pulsars PROPERTIES LINK_FLAGS "-enable -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(Pulsars ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Pulsars ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Pulsars DESTINATION "modules/Pulsars") INSTALL(TARGETS Pulsars DESTINATION "modules/Pulsars")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Pulsars-static STATIC ${Pulsars_SRCS} ${Pulsars_MOC_SRCS } ${Pulsars_RES_CXX} ${PulsarsDialog_UIS_H}) ADD_LIBRARY(Pulsars-static STATIC ${Pulsars_SRCS} ${Pulsars_RES_CXX} ${PulsarsDialog_UIS_H})
SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES OUTPUT_NAME "Pulsars ") SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES OUTPUT_NAME "Pulsars ")
TARGET_LINK_LIBRARIES(Pulsars-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(Pulsars-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN") SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Pulsars-static) ADD_DEPENDENCIES(AllStaticPlugins Pulsars-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/