From 21cc040fa5ac27f918a453d57ab339f2cf1e11b0 Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Tue, 26 May 2020 10:18:24 +0300 Subject: [PATCH] [transit] Added library. --- transit/CMakeLists.txt | 5 ++++- transit/world_feed/CMakeLists.txt | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/transit/CMakeLists.txt b/transit/CMakeLists.txt index a047b362b9..c742837bbc 100644 --- a/transit/CMakeLists.txt +++ b/transit/CMakeLists.txt @@ -17,4 +17,7 @@ set( omim_add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(transit_tests) -add_subdirectory(world_feed) + +if (PLATFORM_DESKTOP) + add_subdirectory(world_feed) +endif() diff --git a/transit/world_feed/CMakeLists.txt b/transit/world_feed/CMakeLists.txt index f7675a3b41..8ca2d2dc7e 100644 --- a/transit/world_feed/CMakeLists.txt +++ b/transit/world_feed/CMakeLists.txt @@ -53,21 +53,27 @@ omim_link_libraries( stb_image sdf_image vulkan_wrapper - ${Qt5Widgets_LIBRARIES} - ${Qt5Network_LIBRARIES} ${LIBZ} ) -if (PLATFORM_LINUX) +if (PLATFORM_MAC) omim_link_libraries( - ${PROJECT_NAME} - dl + ${PROJECT_NAME} + ${Qt5Widgets_LIBRARIES} ) endif() +if (PLATFORM_LINUX) + omim_link_libraries( + ${PROJECT_NAME} + dl + ) +endif() + + link_opengl(${PROJECT_NAME}) link_qt5_core(${PROJECT_NAME}) -link_qt5_network(${PROJECT_NAME}) omim_add_test_subdirectory(world_feed_tests) + add_subdirectory(gtfs_converter)