CMakeLists.txt   CMakeLists.txt 
skipping to change at line 45 skipping to change at line 45
gui/SatellitesDialog.hpp gui/SatellitesDialog.hpp
gui/SatellitesDialog.cpp gui/SatellitesDialog.cpp
gui/SatellitesImportDialog.hpp gui/SatellitesImportDialog.hpp
gui/SatellitesImportDialog.cpp gui/SatellitesImportDialog.cpp
) )
SET(SatellitesDialog_UIS SET(SatellitesDialog_UIS
gui/satellitesDialog.ui gui/satellitesDialog.ui
gui/satellitesImportDialog.ui gui/satellitesImportDialog.ui
) )
QT4_WRAP_UI(SatellitesDialog_UIS_H ${SatellitesDialog_UIS}) QT5_WRAP_UI(SatellitesDialog_UIS_H ${SatellitesDialog_UIS})
SET(Satellites_RES ../resources/Satellites.qrc) SET(Satellites_RES ../resources/Satellites.qrc)
QT4_ADD_RESOURCES(Satellites_RES_CXX ${Satellites_RES}) QT5_ADD_RESOURCES(Satellites_RES_CXX ${Satellites_RES})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${OPENGL_LIBRARIES})
############### For building the dynamic library ###################### ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CX
IF(BUILD_DYNAMIC_PLUGINS) X} ${SatellitesDialog_UIS_H})
ADD_LIBRARY(Satellites MODULE ${Satellites_SRCS} ${Satellites_RES_CX QT5_USE_MODULES(Satellites-static Core Declarative Network OpenGL)
X} ${SatellitesDialog_UIS_H}) # The library target "Satellites-static" has a default OUTPUT_NAME of "Sate
IF(APPLE) llites-static", so change it.
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites"
MARK_AS_ADVANCED(OPENGL_LIBRARY) )
SET_TARGET_PROPERTIES(Satellites PROPERTIES LINK_FLAGS "-und TARGET_LINK_LIBRARIES(Satellites-static ${StelMain} ${extLinkerOption})
efined dynamic_lookup" SUFFIX ".dylib") IF(MSVC)
ENDIF() SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-DQT_ST
ATICPLUGIN")
IF(WIN32) ELSE()
SET_TARGET_PROPERTIES(Satellites PROPERTIES LINK_FLAGS "-Wl SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-DQT_ST
,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) ATICPLUGIN -Wno-unused-parameter")
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(Satellites ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Satellites DESTINATION "modules/Satellites")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites
_RES_CXX} ${SatellitesDialog_UIS_H})
# The library target "Satellites-static" has a default OUTPUT_NAME o
f "Satellites-static", so change it.
SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Sate
llites")
TARGET_LINK_LIBRARIES(Satellites-static ${StelMain} ${extLinkerOptio
n})
SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-
DQT_STATICPLUGIN -Wno-unused-parameter")
ADD_DEPENDENCIES(AllStaticPlugins Satellites-static)
ENDIF() ENDIF()
ADD_DEPENDENCIES(AllStaticPlugins Satellites-static)
 End of changes. 5 change blocks. 
39 lines changed or deleted 17 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/