From 798fe6e920f36de9d254101b9cbe359304adc28f Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 9 Dec 2015 17:16:38 +0300 Subject: [PATCH] Pugixml dependency for index library. --- generator/generator_tool/generator_tool.pro | 2 +- indexer/indexer_tests/indexer_tests.pro | 5 +---- map/benchmark_tool/benchmark_tool.pro | 2 +- map/map_tests/map_tests.pro | 2 +- map/mwm_tests/mwm_tests.pro | 2 +- mapshot/mapshot.pro | 2 +- pedestrian_routing_tests/pedestrian_routing_tests.pro | 2 +- qt/qt.pro | 2 +- .../routing_consistency_tests/routing_consistency_tests.pro | 3 ++- .../routing_integration_tests/routing_integration_tests.pro | 3 ++- routing/routing_tests/routing_tests.pro | 2 +- search/search_integration_tests/search_integration_tests.pro | 2 +- search/search_tests/search_tests.pro | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro index 4c3b066219..0d28a3cdd4 100644 --- a/generator/generator_tool/generator_tool.pro +++ b/generator/generator_tool/generator_tool.pro @@ -3,7 +3,7 @@ ROOT_DIR = ../.. DEPENDENCIES = generator search routing storage indexer platform geometry coding base \ osrm gflags expat tess2 jansson protobuf tomcrypt \ - succinct stats_client + succinct stats_client pugixml include($$ROOT_DIR/common.pri) diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro index a399ae9db6..f33620ce69 100644 --- a/indexer/indexer_tests/indexer_tests.pro +++ b/indexer/indexer_tests/indexer_tests.pro @@ -4,10 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = indexer platform geometry coding base protobuf tomcrypt succinct -!linux { -DEPENDENCIES += opening_hours -} +DEPENDENCIES = indexer platform geometry coding base protobuf tomcrypt pugixml succinct opening_hours include($$ROOT_DIR/common.pri) diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro index 9c322998ce..3212639c4c 100644 --- a/map/benchmark_tool/benchmark_tool.pro +++ b/map/benchmark_tool/benchmark_tool.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt succinct +DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt succinct pugixml include($$ROOT_DIR/common.pri) diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index a08ab4e9fb..03f5afcef5 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map drape_frontend routing search storage drape indexer platform geometry coding base \ - freetype fribidi expat protobuf tomcrypt jansson osrm stats_client minizip succinct + freetype fribidi expat protobuf tomcrypt jansson osrm stats_client minizip succinct pugixml DEPENDENCIES *= opening_hours diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro index 7235e38829..4ba3cdb0a7 100644 --- a/map/mwm_tests/mwm_tests.pro +++ b/map/mwm_tests/mwm_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = map search storage indexer platform geometry coding base \ - freetype fribidi expat protobuf tomcrypt jansson succinct + freetype fribidi expat protobuf tomcrypt jansson succinct pugixml include($$ROOT_DIR/common.pri) diff --git a/mapshot/mapshot.pro b/mapshot/mapshot.pro index 8f7a2bd741..4efe017bce 100644 --- a/mapshot/mapshot.pro +++ b/mapshot/mapshot.pro @@ -3,7 +3,7 @@ ROOT_DIR = .. DEPENDENCIES = map drape_frontend routing search storage indexer drape platform geometry coding base \ freetype expat fribidi tomcrypt gflags jansson protobuf osrm stats_client minizip succinct \ - opening_hours + pugixml opening_hours include($$ROOT_DIR/common.pri) diff --git a/pedestrian_routing_tests/pedestrian_routing_tests.pro b/pedestrian_routing_tests/pedestrian_routing_tests.pro index 2fd2c4b0f5..eeabb8373d 100644 --- a/pedestrian_routing_tests/pedestrian_routing_tests.pro +++ b/pedestrian_routing_tests/pedestrian_routing_tests.pro @@ -5,7 +5,7 @@ TEMPLATE = app ROOT_DIR = ../ DEPENDENCIES = map routing search storage indexer platform geometry coding base \ - osrm jansson protobuf tomcrypt succinct + osrm jansson protobuf tomcrypt succinct pugixml macx-*: LIBS *= "-framework IOKit" diff --git a/qt/qt.pro b/qt/qt.pro index bf3ff6a56c..319bd5aae2 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,7 +1,7 @@ # Main application in qt. ROOT_DIR = .. DEPENDENCIES = map drape_frontend routing search storage indexer drape platform geometry coding base \ - freetype expat fribidi tomcrypt jansson protobuf osrm stats_client minizip succinct + freetype expat fribidi tomcrypt jansson protobuf osrm stats_client minizip succinct pugixml DEPENDENCIES += opening_hours \ diff --git a/routing/routing_consistency_tests/routing_consistency_tests.pro b/routing/routing_consistency_tests/routing_consistency_tests.pro index 10846fa563..b0606c73b2 100644 --- a/routing/routing_consistency_tests/routing_consistency_tests.pro +++ b/routing/routing_consistency_tests/routing_consistency_tests.pro @@ -7,7 +7,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct stats_client generator gflags +DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm \ + jansson protobuf tomcrypt succinct stats_client generator gflags pugixml include($$ROOT_DIR/common.pri) diff --git a/routing/routing_integration_tests/routing_integration_tests.pro b/routing/routing_integration_tests/routing_integration_tests.pro index 2103518ffd..9f8857e19c 100644 --- a/routing/routing_integration_tests/routing_integration_tests.pro +++ b/routing/routing_integration_tests/routing_integration_tests.pro @@ -11,7 +11,8 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct stats_client +DEPENDENCIES = map routing search storage indexer platform geometry coding base \ + osrm jansson protobuf tomcrypt succinct stats_client pugixml DEPENDENCIES += opening_hours diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro index f9cad6e63f..cb08b6a878 100644 --- a/routing/routing_tests/routing_tests.pro +++ b/routing/routing_tests/routing_tests.pro @@ -7,7 +7,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = routing indexer platform_tests_support platform geometry coding base \ - osrm protobuf tomcrypt succinct jansson stats_client map + osrm protobuf tomcrypt succinct jansson stats_client map pugixml macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration" diff --git a/search/search_integration_tests/search_integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro index 5fe218552a..87f4974b54 100644 --- a/search/search_integration_tests/search_integration_tests.pro +++ b/search/search_integration_tests/search_integration_tests.pro @@ -8,7 +8,7 @@ TEMPLATE = app ROOT_DIR = ../.. DEPENDENCIES = search_tests_support generator routing search storage stats_client indexer \ - platform geometry coding base tess2 protobuf tomcrypt jansson succinct + platform geometry coding base tess2 protobuf tomcrypt jansson succinct pugixml DEPENDENCIES += opening_hours \ diff --git a/search/search_tests/search_tests.pro b/search/search_tests/search_tests.pro index 760b3fc7e0..ef2c482692 100644 --- a/search/search_tests/search_tests.pro +++ b/search/search_tests/search_tests.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = search indexer platform geometry coding base protobuf tomcrypt succinct +DEPENDENCIES = search indexer platform geometry coding base protobuf tomcrypt succinct pugixml include($$ROOT_DIR/common.pri)