diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-22 17:31:05 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-03 13:26:55 -0800 |
| commit | eac59a79d8e9589ccc3f1c8879478fd1b9502eef (patch) | |
| tree | a92c990c06008ab34b917e4ce7bdab776d340ee0 | |
| parent | faf4736675167838883a4a10bc30182857d25c32 (diff) | |
| download | subsurface-eac59a79d8e9589ccc3f1c8879478fd1b9502eef.tar.gz | |
build-system/downloader: cli-downloader isn't part of the core
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>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cli-downloader.cpp (renamed from core/cli-downloader.cpp) | 0 | ||||
| -rw-r--r-- | core/CMakeLists.txt | 5 |
3 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a023a8a63..79fd6eddd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -392,6 +392,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable") set(DOWNLOADER_APP subsurface-downloader-main.cpp + cli-downloader.cpp ) source_group("Downloader App" FILES ${DOWNLOADER_APP}) add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES}) diff --git a/core/cli-downloader.cpp b/cli-downloader.cpp index 77053c0c7..77053c0c7 100644 --- a/core/cli-downloader.cpp +++ b/cli-downloader.cpp diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 51ccf608f..1ed24019c 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -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}) |