From 50ec7200e66637abefe685e1875f3d4de2101158 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 3 Sep 2015 15:25:01 -0300 Subject: [PATCH] Single CMake to handle the models This one was pretty easy because of the work I did a few months ago to separate the models from the UI. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 33 ++++----------------------------- qt-models/CMakeLists.txt | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 qt-models/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 620b496ff..cdee60858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,38 +312,16 @@ endif() # include translations add_subdirectory(translations) add_subdirectory(subsurface-core) +add_subdirectory(qt-models) if(FBSUPPORT) add_definitions(-DFBSUPPORT) set(SOCIALNETWORKS qt-ui/socialnetworks.cpp) endif() -# the data models that will interface -# with the views. -set(SUBSURFACE_MODELS_LIB_SRCS - qt-models/cleanertablemodel.cpp - qt-models/cylindermodel.cpp - qt-models/diveplannermodel.cpp - qt-models/models.cpp - qt-models/filtermodels.cpp - qt-models/tankinfomodel.cpp - qt-models/weigthsysteminfomodel.cpp - qt-models/weightmodel.cpp - qt-models/divecomputermodel.cpp - qt-models/treemodel.cpp - qt-models/tableprintmodel.cpp - qt-models/yearlystatisticsmodel.cpp - qt-models/divetripmodel.cpp - qt-models/divecomputerextradatamodel.cpp - qt-models/completionmodels.cpp - qt-models/profileprintmodel.cpp - qt-models/divepicturemodel.cpp - qt-models/diveplotdatamodel.cpp - qt-models/divelocationmodel.cpp - qt-models/divesitepicturesmodel.cpp - qt-models/ssrfsortfilterproxymodel.cpp -) -source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS}) +if(BTSUPPORT) + add_definitions(-DBT_SUPPORT) +endif() # the main app. set(SUBSURFACE_APP @@ -353,9 +331,6 @@ set(SUBSURFACE_APP source_group("Subsurface App" FILES ${SUBSURFACE_APP}) -add_library(subsurface_models STATIC ${SUBSURFACE_MODELS_LIB_SRCS}) -target_link_libraries(subsurface_models ${QT_LIBRARIES}) - # add pthread to the end of the library list on Linux # this is only needed on Ubuntu (why do these idiots break everything?) # but shouldn't hurt on other Linux versions diff --git a/qt-models/CMakeLists.txt b/qt-models/CMakeLists.txt new file mode 100644 index 000000000..463d61412 --- /dev/null +++ b/qt-models/CMakeLists.txt @@ -0,0 +1,28 @@ +# the data models that will interface +# with the views. +set(SUBSURFACE_MODELS_LIB_SRCS + cleanertablemodel.cpp + cylindermodel.cpp + diveplannermodel.cpp + models.cpp + filtermodels.cpp + tankinfomodel.cpp + weigthsysteminfomodel.cpp + weightmodel.cpp + divecomputermodel.cpp + treemodel.cpp + tableprintmodel.cpp + yearlystatisticsmodel.cpp + divetripmodel.cpp + divecomputerextradatamodel.cpp + completionmodels.cpp + profileprintmodel.cpp + divepicturemodel.cpp + diveplotdatamodel.cpp + divelocationmodel.cpp + divesitepicturesmodel.cpp + ssrfsortfilterproxymodel.cpp +) +source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS}) +add_library(subsurface_models STATIC ${SUBSURFACE_MODELS_LIB_SRCS}) +target_link_libraries(subsurface_models ${QT_LIBRARIES}) \ No newline at end of file