mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: add models and shared backends to the downloader

Browse source 
We'll need this in order to be able to actually open dive files and
download things from a dive computer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-14 19:21:16 -08:00
parent 057c151fe8
commit 5a8db97819
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -393,6 +393,9 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES}) add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES})
target_link_libraries( target_link_libraries(
${SUBSURFACE_TARGET} ${SUBSURFACE_TARGET}
subsurface_backend_shared
subsurface_models_downloader
subsurface_commands
subsurface_corelib subsurface_corelib
${SUBSURFACE_LINK_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES}
) )

3
qt-models/CMakeLists.txt
View file

@ -73,4 +73,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
add_library(subsurface_models_mobile STATIC ${SUBSURFACE_GENERIC_MODELS_LIB_SRCS} add_library(subsurface_models_mobile STATIC ${SUBSURFACE_GENERIC_MODELS_LIB_SRCS}
${SUBSURFACE_MOBILE_MODELS_LIB_SRCS}) ${SUBSURFACE_MOBILE_MODELS_LIB_SRCS})
target_link_libraries(subsurface_models_mobile ${QT_LIBRARIES}) target_link_libraries(subsurface_models_mobile ${QT_LIBRARIES})
elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
add_library(subsurface_models_downloader STATIC ${SUBSURFACE_GENERIC_MODELS_LIB_SRCS})
target_link_libraries(subsurface_models_downloader ${QT_LIBRARIES})
endif() endif()

6
qt-models/maplocationmodel.cpp
View file

@ -3,7 +3,7 @@
#include "divelocationmodel.h" #include "divelocationmodel.h"
#include "core/divesite.h" #include "core/divesite.h"
#include "core/divefilter.h" #include "core/divefilter.h"
#ifndef SUBSURFACE_MOBILE #if !defined(SUBSURFACE_MOBILE) && !defined(SUBSURFACE_DOWNLOADER)
#include "qt-models/filtermodels.h" #include "qt-models/filtermodels.h"
#include "desktop-widgets/mapwidget.h" #include "desktop-widgets/mapwidget.h"
#endif #endif
@ -20,7 +20,7 @@ MapLocation::MapLocation(struct dive_site *dsIn, QGeoCoordinate coordIn, QString
// Simplify this! // Simplify this!
static bool inEditMode() static bool inEditMode()
{ {
#ifdef SUBSURFACE_MOBILE #if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER)
return false; return false;
#else #else
return MapWidget::instance()->editMode(); return MapWidget::instance()->editMode();
@ -127,7 +127,7 @@ void MapLocationModel::reload(QObject *map)
QMap<QString, MapLocation *> locationNameMap; QMap<QString, MapLocation *> locationNameMap;
#ifdef SUBSURFACE_MOBILE #if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER)
bool diveSiteMode = false; bool diveSiteMode = false;
#else #else
// In dive site mode (that is when either editing a dive site or on // In dive site mode (that is when either editing a dive site or on