CMakeLists.txt   CMakeLists.txt 
skipping to change at line 59 skipping to change at line 59
gui/widgets/LogBookTextEdit.cpp gui/widgets/LogBookTextEdit.cpp
models/FieldConcatModel.hpp models/FieldConcatModel.hpp
models/FieldConcatModel.cpp models/FieldConcatModel.cpp
) )
### These source groups are only needed for grouping files in an IDE ### These source groups are only needed for grouping files in an IDE
SOURCE_GROUP(GUI FILES REGULAR_EXPRESSION .*Dialog*.+pp|ui$) SOURCE_GROUP(GUI FILES REGULAR_EXPRESSION .*Dialog*.+pp|ui$)
SOURCE_GROUP(DataMappers FILES REGULAR_EXPRESSION .*DataMapper.+pp) SOURCE_GROUP(DataMappers FILES REGULAR_EXPRESSION .*DataMapper.+pp)
SOURCE_GROUP(Models FILES REGULAR_EXPRESSION .*Model.+pp) SOURCE_GROUP(Models FILES REGULAR_EXPRESSION .*Model.+pp)
SOURCE_GROUP(Validators FILES REGULAR_EXPRESSION .*Validator*.+pp) SOURCE_GROUP(Validators FILES REGULAR_EXPRESSION .*Validator*.+pp)
SOURCE_GROUP("moc Files" FILES REGULAR_EXPRESSION moc_.*cxx$)
SET(LogBook_RES ../resources/LogBook.qrc) SET(LogBook_RES ../resources/LogBook.qrc)
QT4_ADD_RESOURCES(LogBook_RES_CXX ${LogBook_RES}) QT4_ADD_RESOURCES(LogBook_RES_CXX ${LogBook_RES})
################# compiles .ui files ############ ################# compiles .ui files ############
SET(LogBook_UIS SET(LogBook_UIS
gui/BarlowsWidget.ui gui/BarlowsWidget.ui
gui/FiltersWidget.ui gui/FiltersWidget.ui
gui/ImagersWidget.ui gui/ImagersWidget.ui
gui/LogBookConfigDialog.ui gui/LogBookConfigDialog.ui
gui/ObservationsDialog.ui gui/ObservationsDialog.ui
gui/ObserversWidget.ui gui/ObserversWidget.ui
gui/OcularsWidget.ui gui/OcularsWidget.ui
gui/OpticsWidget.ui gui/OpticsWidget.ui
gui/SitesWidget.ui gui/SitesWidget.ui
gui/SessionsDialog.ui gui/SessionsDialog.ui
gui/TargetsDialog.ui gui/TargetsDialog.ui
) )
QT4_WRAP_UI(LogBook_UIS_H ${LogBook_UIS}) QT4_WRAP_UI(LogBook_UIS_H ${LogBook_UIS})
# Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(LogBook_MOC_HDRS
LogBook.hpp
gui/LogBookConfigDialog.hpp
gui/ObservationsDialog.hpp
gui/SessionsDialog.hpp
gui/StelDialogLogBook.hpp
gui/TargetsDialog.hpp
gui/dataMappers/BarlowsDataMapper.hpp
gui/dataMappers/FiltersDataMapper.hpp
gui/dataMappers/ImagersDataMapper.hpp
gui/dataMappers/ObserversDataMapper.hpp
gui/dataMappers/OcularsDataMapper.hpp
gui/dataMappers/OpticsDataMapper.hpp
gui/dataMappers/SitesDataMapper.hpp
gui/validators/LimitingDoubleValidator.hpp
gui/validators/LimitingIntValidator.hpp
gui/validators/NonEmptyStringValidator.hpp
gui/widgets/LogBookTextEdit.hpp
models/FieldConcatModel.hpp
)
# After this call, LogBook_MOC_SRCS = moc_LogBook.cxx
QT4_WRAP_CPP(LogBook_MOC_SRCS ${LogBook_MOC_HDRS})
SET(QT_USE_QTSQL TRUE) SET(QT_USE_QTSQL TRUE)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
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(LogBook ADD_LIBRARY(LogBook
MODULE ${LogBook_SRCS} ${LogBook_MOC_SRCS} ${LogBook_RES_CXX } ${LogBook_UIS_H} MODULE ${LogBook_SRCS} ${LogBook_RES_CXX} ${LogBook_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(LogBook SET_TARGET_PROPERTIES(LogBook
PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SU FFIX ".dylib" PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SU FFIX ".dylib"
) )
ENDIF(APPLE) ENDIF(APPLE)
skipping to change at line 141 skipping to change at line 114
SET(StelMain) SET(StelMain)
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(LogBook ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(LogBook ${StelMain} ${extLinkerOption})
INSTALL(TARGETS LogBook DESTINATION "modules/${PACKAGE}") INSTALL(TARGETS LogBook 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(LogBook-static ADD_LIBRARY(LogBook-static
STATIC ${LogBook_SRCS} ${LogBook_MOC_SRCS} ${LogBook_RES_CXX } ${LogBook_UIS_H} STATIC ${LogBook_SRCS} ${LogBook_RES_CXX} ${LogBook_UIS_H}
) )
SET_TARGET_PROPERTIES(LogBook-static PROPERTIES OUTPUT_NAME "LogBook ") SET_TARGET_PROPERTIES(LogBook-static PROPERTIES OUTPUT_NAME "LogBook ")
TARGET_LINK_LIBRARIES(LogBook-static ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(LogBook-static ${StelMain} ${extLinkerOption})
SET_TARGET_PROPERTIES(LogBook-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN") SET_TARGET_PROPERTIES(LogBook-static PROPERTIES COMPILE_FLAGS "-DQT_ STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins LogBook-static) ADD_DEPENDENCIES(AllStaticPlugins LogBook-static)
ENDIF() ENDIF()
 End of changes. 4 change blocks. 
29 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/