CMakeLists.txt   CMakeLists.txt 
skipping to change at line 29 skipping to change at line 29
) )
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}) QT4_WRAP_UI(SolarSystemEditor_UIS_H ${SolarSystemEditor_UIS})
#SET(SolarSystemEditor_RES ../resources/resources.qrc)
#QT4_ADD_RESOURCES(SolarSystemEditor_RES_CXX ${SolarSystemEditor_RES})
SET(SolarSystemEditor_MOC_HDRS
gui/SolarSystemManagerWindow.hpp
gui/MpcImportWindow.hpp
gui/ManualImportWindow.hpp
SolarSystemEditor.hpp
)
QT4_WRAP_CPP(SolarSystemEditor_MOC_SRCS ${SolarSystemEditor_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
#Dynamic library #Dynamic library
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(SolarSystemEditor MODULE ${SolarSystemEditor_SRCS} ${SolarSyst emEditor_MOC_SRCS} ${SolarSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H}) ADD_LIBRARY(SolarSystemEditor MODULE ${SolarSystemEditor_SRCS} ${SolarSyst emEditor_RES_CXX} ${SolarSystemEditor_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(SolarSystemEditor PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE) ENDIF(APPLE)
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-enable-ru ntime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-enable-ru ntime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
skipping to change at line 67 skipping to change at line 55
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(SolarSystemEditor ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(SolarSystemEditor ${StelMain} ${extLinkerOption})
INSTALL(TARGETS SolarSystemEditor DESTINATION "modules/SolarSystemEditor") INSTALL(TARGETS SolarSystemEditor DESTINATION "modules/SolarSystemEditor")
ENDIF() ENDIF()
#Static library #Static library
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(SolarSystemEditor-static STATIC ${SolarSystemEditor_SRCS} ${So larSystemEditor_MOC_SRCS} ${SolarSystemEditor_RES_CXX} ${SolarSystemEditor_ UIS_H}) ADD_LIBRARY(SolarSystemEditor-static STATIC ${SolarSystemEditor_SRCS} ${So larSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H})
SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "Sol arSystemEditor") SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "Sol arSystemEditor")
TARGET_LINK_LIBRARIES(SolarSystemEditor-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(SolarSystemEditor-static ${extLinkerOption})
SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "- DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "- DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static) ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
14 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/