diff options
| author | Maxim Pimenov <m@maps.me> | 2017-03-01 13:42:38 +0300 |
|---|---|---|
| committer | Maxim Pimenov <m@maps.me> | 2017-03-03 18:48:04 +0300 |
| commit | b1a6f766f4e96d499beab1c4b4c14ea01c523c6f (patch) | |
| tree | 43d8ec41709615dbe669e0363751a314cff50246 /storage | |
| parent | aaa7e9c66592beaeb02dce8102f408eba0ae5dd9 (diff) | |
[routing][traffic] Removed a circular dependency.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/storage_integration_tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/storage_integration_tests/storage_integration_tests.pro | 3 | ||||
| -rw-r--r-- | storage/storage_tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/storage_tests/storage_tests.pro | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index 1e8fc35df3..819484bab7 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -22,6 +22,7 @@ omim_link_libraries( map drape_frontend routing + routing_common search storage tracking diff --git a/storage/storage_integration_tests/storage_integration_tests.pro b/storage/storage_integration_tests/storage_integration_tests.pro index d9ddd4ce5c..4188439612 100644 --- a/storage/storage_integration_tests/storage_integration_tests.pro +++ b/storage/storage_integration_tests/storage_integration_tests.pro @@ -6,7 +6,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map drape_frontend routing search storage tracking traffic indexer drape partners_api platform_tests_support platform editor opening_hours geometry \ +DEPENDENCIES = map drape_frontend routing search storage tracking traffic routing_common indexer drape \ + partners_api platform_tests_support platform editor opening_hours geometry \ coding base freetype expat fribidi jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index 1dd9ea51dc..eaf31cce26 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -32,6 +32,7 @@ omim_link_libraries( generator search routing + routing_common indexer platform_tests_support osrm diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index 764c5410ae..32016578bc 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -11,7 +11,7 @@ macx*|win32*|linux* { DEPENDENCIES = generator_tests_support generator } -DEPENDENCIES *= drape_frontend map routing traffic \ +DEPENDENCIES *= drape_frontend map routing traffic routing_common \ search storage indexer drape platform_tests_support platform editor opening_hours geometry \ coding base freetype expat fribidi jansson tess2 protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image |