CMakeLists.txt   CMakeLists.txt 
skipping to change at line 27 skipping to change at line 27
################# compiles resources files ############ ################# compiles resources files ############
SET(ObservabilityDialog_UIS SET(ObservabilityDialog_UIS
gui/ObservabilityDialog.ui gui/ObservabilityDialog.ui
) )
QT4_WRAP_UI(ObservabilityDialog_UIS_H ${ObservabilityDialog_UIS}) QT4_WRAP_UI(ObservabilityDialog_UIS_H ${ObservabilityDialog_UIS})
SET(Observability_RES ../Observability.qrc) SET(Observability_RES ../Observability.qrc)
QT4_ADD_RESOURCES(Observability_RES_CXX ${Observability_RES}) QT4_ADD_RESOURCES(Observability_RES_CXX ${Observability_RES})
SET(Observability_MOC_HDRS
Observability.hpp
gui/ObservabilityDialog.hpp
)
QT4_WRAP_CPP(Observability_MOC_SRCS ${Observability_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(Observability MODULE ${Observability_SRCS} ${Observabili ty_MOC_SRCS} ${Observability_RES_CXX} ${ObservabilityDialog_UIS_H}) ADD_LIBRARY(Observability MODULE ${Observability_SRCS} ${Observabili ty_RES_CXX} ${ObservabilityDialog_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(Observability PROPERTIES LINK_FLAGS "- undefined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(Observability PROPERTIES LINK_FLAGS "- undefined dynamic_lookup" SUFFIX ".dylib")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(Observability PROPERTIES LINK_FLAGS "- enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(Observability PROPERTIES LINK_FLAGS "- enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
ELSE(WIN32) ELSE(WIN32)
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Observability ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Observability ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Observability DESTINATION "modules/Observability") INSTALL(TARGETS Observability DESTINATION "modules/Observability")
ENDIF() ENDIF()
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Observability-static STATIC ${Observability_SRCS} ${Obse rvability_MOC_SRCS} ${Observability_RES_CXX} ${ObservabilityDialog_UIS_H}) ADD_LIBRARY(Observability-static STATIC ${Observability_SRCS} ${Obse rvability_RES_CXX} ${ObservabilityDialog_UIS_H})
SET_TARGET_PROPERTIES(Observability-static PROPERTIES OUTPUT_NAME "O bservability") SET_TARGET_PROPERTIES(Observability-static PROPERTIES OUTPUT_NAME "O bservability")
TARGET_LINK_LIBRARIES(Observability-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(Observability-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Observability-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(Observability-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Observability-static) ADD_DEPENDENCIES(AllStaticPlugins Observability-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
9 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/