CMakeLists.txt   CMakeLists.txt 
skipping to change at line 33 skipping to change at line 33
gsatellite/stdsat.h gsatellite/stdsat.h
gSatWrapper.hpp gSatWrapper.hpp
gSatWrapper.cpp gSatWrapper.cpp
Satellite.hpp Satellite.hpp
Satellite.cpp Satellite.cpp
Satellites.hpp Satellites.hpp
Satellites.cpp Satellites.cpp
gui/SatellitesDialog.hpp gui/SatellitesDialog.hpp
gui/SatellitesDialog.cpp gui/SatellitesDialog.cpp
gui/SatellitesImportDialog.hpp
gui/SatellitesImportDialog.cpp
) )
SET(SatellitesDialog_UIS SET(SatellitesDialog_UIS
gui/satellitesDialog.ui gui/satellitesDialog.ui
gui/satellitesImportDialog.ui
) )
QT4_WRAP_UI(SatellitesDialog_UIS_H ${SatellitesDialog_UIS}) QT4_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}) QT4_ADD_RESOURCES(Satellites_RES_CXX ${Satellites_RES})
# Add here all the files which require moc compilation # Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc.. # that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(Satellites_MOC_HDRS SET(Satellites_MOC_HDRS
Satellites.hpp Satellites.hpp
gui/SatellitesDialog.hpp gui/SatellitesDialog.hpp
gui/SatellitesImportDialog.hpp
) )
# After this call, Satellites_MOC_SRCS = moc_Satellites.cxx # After this call, Satellites_MOC_SRCS = moc_Satellites.cxx
QT4_WRAP_CPP(Satellites_MOC_SRCS ${Satellites_MOC_HDRS}) QT4_WRAP_CPP(Satellites_MOC_SRCS ${Satellites_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
############### For building the dynamic library ###################### ############### For building the dynamic library ######################
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(Satellites MODULE ${Satellites_SRCS} ${Satellites_MOC_SR CS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) ADD_LIBRARY(Satellites MODULE ${Satellites_SRCS} ${Satellites_MOC_SR CS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
skipping to change at line 81 skipping to change at line 85
TARGET_LINK_LIBRARIES(Satellites ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Satellites ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Satellites DESTINATION "modules/Satellites") INSTALL(TARGETS Satellites DESTINATION "modules/Satellites")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites _MOC_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites _MOC_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
# The library target "Satellites-static" has a default OUTPUT_NAME o f "Satellites-static", so change it. # 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") SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Sate llites")
TARGET_LINK_LIBRARIES(Satellites-static ${StelMain} ${extLinkerOptio n}) TARGET_LINK_LIBRARIES(Satellites-static ${StelMain} ${extLinkerOptio n})
SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-D QT_STATICPLUGIN") SET_TARGET_PROPERTIES(Satellites-static PROPERTIES COMPILE_FLAGS "-D QT_STATICPLUGIN -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-un used-but-set-variable")
ADD_DEPENDENCIES(AllStaticPlugins Satellites-static) ADD_DEPENDENCIES(AllStaticPlugins Satellites-static)
ENDIF() ENDIF()
 End of changes. 4 change blocks. 
1 lines changed or deleted 5 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/