CMakeLists.txt   CMakeLists.txt 
skipping to change at line 22 skipping to change at line 22
Observability.cpp Observability.cpp
gui/ObservabilityDialog.hpp gui/ObservabilityDialog.hpp
gui/ObservabilityDialog.cpp gui/ObservabilityDialog.cpp
) )
################# 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}) QT5_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}) QT5_ADD_RESOURCES(Observability_RES_CXX ${Observability_RES})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
IF(BUILD_DYNAMIC_PLUGINS) ADD_LIBRARY(Observability-static STATIC ${Observability_SRCS} ${Observabili
ADD_LIBRARY(Observability MODULE ${Observability_SRCS} ${Observabili ty_RES_CXX} ${ObservabilityDialog_UIS_H})
ty_RES_CXX} ${ObservabilityDialog_UIS_H}) QT5_USE_MODULES(Observability-static Core Declarative Network)
IF(APPLE) SET_TARGET_PROPERTIES(Observability-static PROPERTIES OUTPUT_NAME "Observab
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) ility")
MARK_AS_ADVANCED(OPENGL_LIBRARY) TARGET_LINK_LIBRARIES(Observability-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Observability PROPERTIES LINK_FLAGS "- SET_TARGET_PROPERTIES(Observability-static PROPERTIES COMPILE_FLAGS "-DQT_S
undefined dynamic_lookup" SUFFIX ".dylib") TATICPLUGIN")
ENDIF() ADD_DEPENDENCIES(AllStaticPlugins Observability-static)
IF(WIN32)
SET_TARGET_PROPERTIES(Observability PROPERTIES LINK_FLAGS "-
Wl,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Observability ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Observability DESTINATION "modules/Observability")
ENDIF()
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Observability-static STATIC ${Observability_SRCS} ${Obse
rvability_RES_CXX} ${ObservabilityDialog_UIS_H})
SET_TARGET_PROPERTIES(Observability-static PROPERTIES OUTPUT_NAME "O
bservability")
TARGET_LINK_LIBRARIES(Observability-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Observability-static PROPERTIES COMPILE_FLAGS
"-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Observability-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/