CMakeLists.txt   CMakeLists.txt 
skipping to change at line 27 skipping to change at line 27
gui/ManualImportWindow.hpp gui/ManualImportWindow.hpp
gui/ManualImportWindow.cpp gui/ManualImportWindow.cpp
) )
SET(SolarSystemEditor_UIS SET(SolarSystemEditor_UIS
gui/solarSystemManagerWindow.ui gui/solarSystemManagerWindow.ui
gui/mpcImportWindow.ui gui/mpcImportWindow.ui
gui/manualImportWindow.ui gui/manualImportWindow.ui
) )
QT4_WRAP_UI(SolarSystemEditor_UIS_H ${SolarSystemEditor_UIS}) QT5_WRAP_UI(SolarSystemEditor_UIS_H ${SolarSystemEditor_UIS})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${OPENGL_LIBRARIES})
#Dynamic library ADD_LIBRARY(SolarSystemEditor-static STATIC ${SolarSystemEditor_SRCS} ${Sol
IF(BUILD_DYNAMIC_PLUGINS) arSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H})
ADD_LIBRARY(SolarSystemEditor MODULE ${SolarSystemEditor_SRCS} ${SolarSyst QT5_USE_MODULES(SolarSystemEditor-static Core Declarative Network)
emEditor_RES_CXX} ${SolarSystemEditor_UIS_H}) SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "Sola
rSystemEditor")
IF(APPLE) TARGET_LINK_LIBRARIES(SolarSystemEditor-static ${extLinkerOption})
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "-D
MARK_AS_ADVANCED(OPENGL_LIBRARY) QT_STATICPLUGIN")
SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-undefined ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static)
dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE)
IF(WIN32)
SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-Wl,--enab
le-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(SolarSystemEditor ${StelMain} ${extLinkerOption})
INSTALL(TARGETS SolarSystemEditor DESTINATION "modules/SolarSystemEditor")
ENDIF()
#Static library
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(SolarSystemEditor-static STATIC ${SolarSystemEditor_SRCS} ${So
larSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H})
SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "Sol
arSystemEditor")
TARGET_LINK_LIBRARIES(SolarSystemEditor-static ${extLinkerOption})
SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "-
DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static)
ENDIF()
 End of changes. 3 change blocks. 
2 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/