CMakeLists.txt   CMakeLists.txt 
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
. .
gui gui
${CMAKE_BINARY_DIR}/plugins/Oculars/src ${CMAKE_BINARY_DIR}/plugins/Oculars/src
) )
LINK_DIRECTORIES(/src) LINK_DIRECTORIES(/src)
SET(Oculars_SRCS SET(Oculars_SRCS
CCD.hpp
CCD.cpp
Ocular.hpp Ocular.hpp
Ocular.cpp Ocular.cpp
Oculars.hpp Oculars.hpp
Oculars.cpp Oculars.cpp
Telescope.hpp Telescope.hpp
Telescope.cpp Telescope.cpp
gui/OcularDialog.hpp gui/OcularDialog.hpp
gui/OcularDialog.cpp gui/OcularDialog.cpp
gui/StelDialogOculars.hpp gui/StelDialogOculars.hpp
gui/StelDialogOculars.cpp gui/StelDialogOculars.cpp
skipping to change at line 34 skipping to change at line 36
################# compiles .ui files ############ ################# compiles .ui files ############
SET(Oculars_UIS SET(Oculars_UIS
gui/ocularDialog.ui gui/ocularDialog.ui
) )
QT4_WRAP_UI(Oculars_UIS_H ${Oculars_UIS}) QT4_WRAP_UI(Oculars_UIS_H ${Oculars_UIS})
# 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(Oculars_MOC_HDRS SET(Oculars_MOC_HDRS
CCD.hpp
Ocular.hpp Ocular.hpp
Oculars.hpp Oculars.hpp
Telescope.hpp Telescope.hpp
gui/OcularDialog.hpp gui/OcularDialog.hpp
gui/StelDialogOculars.hpp gui/StelDialogOculars.hpp
) )
# After this call, Oculars_MOC_SRCS = moc_Oculars.cxx # After this call, Oculars_MOC_SRCS = moc_Oculars.cxx
QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS}) QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS})
skipping to change at line 83 skipping to change at line 86
INSTALL(TARGETS Oculars DESTINATION "modules/${PACKAGE}") INSTALL(TARGETS Oculars DESTINATION "modules/${PACKAGE}")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Oculars-static ADD_LIBRARY(Oculars-static
STATIC ${Oculars_SRCS} ${Oculars_MOC_SRCS} ${Oculars_RES_CXX } ${Oculars_UIS_H} STATIC ${Oculars_SRCS} ${Oculars_MOC_SRCS} ${Oculars_RES_CXX } ${Oculars_UIS_H}
) )
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars ") SET_TARGET_PROPERTIES(Oculars-static PROPERTIES OUTPUT_NAME "Oculars ")
TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Oculars-static ${StelMain} ${extLinkerOption})
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-fPIC IF(WIN32)
-DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAG
S "-DQT_STATICPLUGIN")
ELSE()
SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAG
S "-fPIC -DQT_STATICPLUGIN")
ENDIF()
ADD_DEPENDENCIES(AllStaticPlugins Oculars-static) ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
2 lines changed or deleted 10 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/