CMakeLists.txt   CMakeLists.txt 
skipping to change at line 61 skipping to change at line 61
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)
SET(LogBook_RES ../resources/LogBook.qrc) SET(LogBook_RES ../resources/LogBook.qrc)
QT4_ADD_RESOURCES(LogBook_RES_CXX ${LogBook_RES}) QT5_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}) QT5_WRAP_UI(LogBook_UIS_H ${LogBook_UIS})
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_RES_CXX} ${LogBook_UIS_H} MODULE ${LogBook_SRCS} ${LogBook_RES_CXX} ${LogBook_UIS_H}
 End of changes. 2 change blocks. 
2 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/