From 053356c49b34b5183ddb2e394bb916470115295b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 2 Mar 2020 08:41:00 -0800 Subject: [PATCH] build-system: remove pointless distinction between desktop and mobile It's the same sources, the same library. Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 4 ++-- 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})