mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system/downloader: cli-downloader isn't part of the core

Browse source 
It's part of the main excutable / helper and needs to be linked before
all of our support libraries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-22 17:31:05 -08:00
parent faf4736675
commit eac59a79d8
3 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/CMakeLists.txt
View file

@ -20,10 +20,6 @@ if(FTDISUPPORT)
set(SERIAL_FTDI serial_ftdi.c)
endif()
if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
set(DOWNLOADER cli-downloader.cpp)
endif()
if(BTSUPPORT)
add_definitions(-DBT_SUPPORT)
set(BT_SRC_FILES desktop-widgets/btdeviceselectiondialog.cpp)
@ -256,7 +252,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
${SERIAL_FTDI}
${PLATFORM_SRC}
${BT_CORE_SRC_FILES}
${DOWNLOADER}
)
source_group("Subsurface Core" FILES ${SUBSURFACE_CORE_LIB_SRCS})

39
core/cli-downloader.cpp
View file

@ -1,39 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
#include "qt-models/diveimportedmodel.h"
#include <QObject>
#include <QUndoStack>
void cliDownloader(const char *vendor, const char *product, const char *device)
{
DiveImportedModel *diveImportedModel = new DiveImportedModel();
DiveImportedModel::connect(diveImportedModel, &DiveImportedModel::downloadFinished, [] {
// do something useful at the end of the download
printf("Finished\n");
});
auto data = diveImportedModel->thread.data();
data->setVendor(vendor);
data->setProduct(product);
data->setBluetoothMode(false);
if (data->vendor() == "Uemis") {
char *colon;
char *devname = strdup(device);
if ((colon = strstr(devname, ":\\ (UEMISSDA)")) != NULL) {
*(colon + 2) = '\0';
fprintf(stderr, "shortened devname to \"%s\"", devname);
}
data->setDevName(devname);
} else {
data->setDevName(device);
}
// some assumptiond - should all be configurable
data->setForceDownload(false);
data->setSaveLog(true);
data->setSaveDump(false);
// before we start, remember where the dive_table ended
diveImportedModel->startDownload();
}