CMakeLists.txt   CMakeLists.txt 
skipping to change at line 23 skipping to change at line 23
Nova.hpp Nova.hpp
Nova.cpp Nova.cpp
gui/NovaeDialog.hpp gui/NovaeDialog.hpp
gui/NovaeDialog.cpp gui/NovaeDialog.cpp
) )
SET(NovaeDialog_UIS SET(NovaeDialog_UIS
gui/novaeDialog.ui gui/novaeDialog.ui
) )
QT4_WRAP_UI(NovaeDialog_UIS_H ${NovaeDialog_UIS}) QT5_WRAP_UI(NovaeDialog_UIS_H ${NovaeDialog_UIS})
SET(Novae_RES ../resources/Novae.qrc) SET(Novae_RES ../resources/Novae.qrc)
QT4_ADD_RESOURCES(Novae_RES_CXX ${Novae_RES}) QT5_ADD_RESOURCES(Novae_RES_CXX ${Novae_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(Novae-static STATIC ${Novae_SRCS} ${Novae_RES_CXX} ${NovaeDialo
IF(BUILD_DYNAMIC_PLUGINS) g_UIS_H})
ADD_LIBRARY(Novae MODULE ${Novae_SRCS} ${Novae_RES_CXX} ${NovaeDialo QT5_USE_MODULES(Novae-static Core Network OpenGL)
g_UIS_H}) SET_TARGET_PROPERTIES(Novae-static PROPERTIES OUTPUT_NAME "Novae")
IF(APPLE) TARGET_LINK_LIBRARIES(Novae-static ${extLinkerOption})
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(Novae-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLU
MARK_AS_ADVANCED(OPENGL_LIBRARY) GIN")
SET_TARGET_PROPERTIES(Novae PROPERTIES LINK_FLAGS "-undefine ADD_DEPENDENCIES(AllStaticPlugins Novae-static)
d dynamic_lookup" SUFFIX ".dylib")
ENDIF()
IF(WIN32)
SET_TARGET_PROPERTIES(Novae PROPERTIES LINK_FLAGS "-Wl,--en
able-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Novae ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Novae DESTINATION "modules/Novae")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Novae-static STATIC ${Novae_SRCS} ${Novae_RES_CXX} ${Nov
aeDialog_UIS_H})
SET_TARGET_PROPERTIES(Novae-static PROPERTIES OUTPUT_NAME "Novae")
TARGET_LINK_LIBRARIES(Novae-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Novae-static PROPERTIES COMPILE_FLAGS "-DQT_ST
ATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Novae-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/