CMakeLists.txt   CMakeLists.txt 
skipping to change at line 23 skipping to change at line 23
Pulsar.hpp Pulsar.hpp
Pulsar.cpp Pulsar.cpp
gui/PulsarsDialog.hpp gui/PulsarsDialog.hpp
gui/PulsarsDialog.cpp gui/PulsarsDialog.cpp
) )
SET(PulsarsDialog_UIS SET(PulsarsDialog_UIS
gui/pulsarsDialog.ui gui/pulsarsDialog.ui
) )
QT4_WRAP_UI(PulsarsDialog_UIS_H ${PulsarsDialog_UIS}) QT5_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}) QT5_ADD_RESOURCES(Pulsars_RES_CXX ${Pulsars_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(Pulsars-static STATIC ${Pulsars_SRCS} ${Pulsars_RES_CXX} ${Puls
IF(BUILD_DYNAMIC_PLUGINS) arsDialog_UIS_H})
ADD_LIBRARY(Pulsars MODULE ${Pulsars_SRCS} ${Pulsars_RES_CXX} ${Puls QT5_USE_MODULES(Pulsars-static Core Declarative Network)
arsDialog_UIS_H}) SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES OUTPUT_NAME "Pulsars")
IF(APPLE) TARGET_LINK_LIBRARIES(Pulsars-static ${extLinkerOption})
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICP
MARK_AS_ADVANCED(OPENGL_LIBRARY) LUGIN")
SET_TARGET_PROPERTIES(Pulsars PROPERTIES LINK_FLAGS "-undefi ADD_DEPENDENCIES(AllStaticPlugins Pulsars-static)
ned dynamic_lookup" SUFFIX ".dylib")
ENDIF()
IF(WIN32)
SET_TARGET_PROPERTIES(Pulsars PROPERTIES LINK_FLAGS "-Wl,--
enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Pulsars ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Pulsars DESTINATION "modules/Pulsars")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Pulsars-static STATIC ${Pulsars_SRCS} ${Pulsars_RES_CXX}
${PulsarsDialog_UIS_H})
SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES OUTPUT_NAME "Pulsars
")
TARGET_LINK_LIBRARIES(Pulsars-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Pulsars-static PROPERTIES COMPILE_FLAGS "-DQT_
STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Pulsars-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/