CMakeLists.txt   CMakeLists.txt 
skipping to change at line 22 skipping to change at line 22
Exoplanets.cpp Exoplanets.cpp
Exoplanet.hpp Exoplanet.hpp
Exoplanet.cpp Exoplanet.cpp
gui/ExoplanetsDialog.hpp gui/ExoplanetsDialog.hpp
gui/ExoplanetsDialog.cpp gui/ExoplanetsDialog.cpp
) )
SET(ExoplanetsDialog_UIS SET(ExoplanetsDialog_UIS
gui/exoplanetsDialog.ui gui/exoplanetsDialog.ui
) )
QT4_WRAP_UI(ExoplanetsDialog_UIS_H ${ExoplanetsDialog_UIS}) QT5_WRAP_UI(ExoplanetsDialog_UIS_H ${ExoplanetsDialog_UIS})
SET(Exoplanets_RES ../resources/Exoplanets.qrc) SET(Exoplanets_RES ../resources/Exoplanets.qrc)
QT4_ADD_RESOURCES(Exoplanets_RES_CXX ${Exoplanets_RES}) QT5_ADD_RESOURCES(Exoplanets_RES_CXX ${Exoplanets_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(Exoplanets-static STATIC ${Exoplanets_SRCS} ${Exoplanets_RES_CX
IF(BUILD_DYNAMIC_PLUGINS) X} ${ExoplanetsDialog_UIS_H})
ADD_LIBRARY(Exoplanets MODULE ${Exoplanets_SRCS} ${Exoplanets_RES_CX QT5_USE_MODULES(Exoplanets-static Core Declarative Network Widgets)
X} ${ExoplanetsDialog_UIS_H}) SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES OUTPUT_NAME "Exoplanets"
IF(APPLE) )
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) TARGET_LINK_LIBRARIES(Exoplanets-static ${extLinkerOption})
MARK_AS_ADVANCED(OPENGL_LIBRARY) SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES COMPILE_FLAGS "-DQT_STAT
SET_TARGET_PROPERTIES(Exoplanets PROPERTIES LINK_FLAGS "-und ICPLUGIN")
efined dynamic_lookup" SUFFIX ".dylib") ADD_DEPENDENCIES(AllStaticPlugins Exoplanets-static)
ENDIF()
IF(WIN32)
SET_TARGET_PROPERTIES(Exoplanets PROPERTIES LINK_FLAGS "-Wl
,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Exoplanets ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Exoplanets DESTINATION "modules/Exoplanets")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Exoplanets-static STATIC ${Exoplanets_SRCS} ${Exoplanets
_RES_CXX} ${ExoplanetsDialog_UIS_H})
SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES OUTPUT_NAME "Exop
lanets")
TARGET_LINK_LIBRARIES(Exoplanets-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Exoplanets-static PROPERTIES COMPILE_FLAGS "-D
QT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Exoplanets-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/