From 02ef888f7538630059ae1d00ab5ee43184dc6c0e Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 1 Jun 2016 13:29:27 +0300 Subject: [PATCH] [tests] Fix tests dependencies in omim.pro --- omim.pro | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/omim.pro b/omim.pro index b6188b83f6..ffca2e6d7b 100644 --- a/omim.pro +++ b/omim.pro @@ -28,6 +28,14 @@ SUBDIRS = 3party base coding geometry editor indexer routing search !CONFIG(osrm) { SUBDIRS *= platform stats storage + CONFIG(desktop) { + SUBDIRS *= generator + + generator_tool.subdir = generator/generator_tool + generator_tool.depends = $$SUBDIRS + SUBDIRS *= generator_tool + } + # Integration tests dependencies for gtool. # TODO(AlexZ): Avoid duplication for routing_integration_tests. CONFIG(gtool):!CONFIG(no-tests) { @@ -43,14 +51,6 @@ SUBDIRS = 3party base coding geometry editor indexer routing search feature_segments_checker.depends = $$SUBDIRS routing SUBDIRS *= routing_integration_tests routing_consistency_tests srtm_coverage_checker feature_segments_checker } - - CONFIG(desktop) { - SUBDIRS *= generator - - generator_tool.subdir = generator/generator_tool - generator_tool.depends = $$SUBDIRS - SUBDIRS *= generator_tool - } } !CONFIG(gtool):!CONFIG(osrm) {