diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-02 08:41:00 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-03-10 09:25:57 -0700 |
| commit | 053356c49b34b5183ddb2e394bb916470115295b (patch) | |
| tree | 650c84c2956b21f457ff7ec4f556c9eb07d8602e | |
| parent | 0720e74c1afc5cbd51593db08add58bc277213c8 (diff) | |
| download | subsurface-053356c49b34b5183ddb2e394bb916470115295b.tar.gz | |
build-system: remove pointless distinction between desktop and mobile
It's the same sources, the same library.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | commands/CMakeLists.txt | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cdc17066b..95a862616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,7 +314,7 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") subsurface_mapwidget subsurface_backend_shared subsurface_models_mobile - subsurface_commands_mobile + subsurface_commands subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} ) @@ -339,7 +339,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") subsurface_mapwidget subsurface_backend_shared subsurface_models_desktop - subsurface_commands_desktop + subsurface_commands subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} ) diff --git a/commands/CMakeLists.txt b/commands/CMakeLists.txt index 6d6ee1d64..4b0c37dc6 100644 --- a/commands/CMakeLists.txt +++ b/commands/CMakeLists.txt @@ -15,10 +15,5 @@ set(SUBSURFACE_GENERIC_COMMANDS_SRCS command_edit_trip.cpp command_edit_trip.h ) -if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") - add_library(subsurface_commands_desktop STATIC ${SUBSURFACE_GENERIC_COMMANDS_SRCS}) - target_link_libraries(subsurface_commands_desktop ${QT_LIBRARIES}) -elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") - add_library(subsurface_commands_mobile STATIC ${SUBSURFACE_GENERIC_COMMANDS_SRCS}) - target_link_libraries(subsurface_commands_mobile ${QT_LIBRARIES}) -endif() +add_library(subsurface_commands STATIC ${SUBSURFACE_GENERIC_COMMANDS_SRCS}) +target_link_libraries(subsurface_commands ${QT_LIBRARIES}) |