diff options
author | Ilya Zverev <zverik@textual.ru> | 2015-09-10 21:10:50 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:04:35 +0300 |
commit | c536dc76ca6522b41a4758676fa40996e707b74b (patch) | |
tree | 85943b634b8e97603f980dc0cbcb0e5c92ac958a | |
parent | d52ffa0ee1c557c1287b86ce3689c9927adfea70 (diff) |
Update omim.pro, include int_tests to gtool
-rw-r--r-- | common.pri | 5 | ||||
-rw-r--r-- | omim.pro | 30 |
2 files changed, 21 insertions, 14 deletions
diff --git a/common.pri b/common.pri index bd630901f9..c6fa2b1700 100644 --- a/common.pri +++ b/common.pri @@ -9,6 +9,11 @@ drape { DEFINES *= USE_DRAPE } +CONFIG(map_designer) { + DEFINES *= STANDALONE_APP + DEFINES *= BUILD_DESIGNER +} + # our own version variables VERSION_MAJOR = 2 VERSION_MINOR = 4 @@ -2,7 +2,7 @@ # # Possible options: # gtool: build only generator_tool -# skin-gen: build skin-generator tool +# map_designer: enable designer-related flags # no-tests: do not build tests for desktop # drape: include drape libraries # iphone / tizen / android: build an app (implies no-tests) @@ -26,11 +26,6 @@ win32:CONFIG(drape) { CONFIG *= desktop } -CONFIG(designer) { - DEFINES *= BUILD_DESIGNER - CONFIG *= skin-gen -} - SUBDIRS = 3party base geometry coding SUBDIRS += platform @@ -39,23 +34,30 @@ SUBDIRS += indexer SUBDIRS += routing SUBDIRS += storage +# Integration tests dependencies for gtool +CONFIG(gtool):!CONFIG(no-tests) { + SUBDIRS += search + SUBDIRS += map + SUBDIRS += integration_tests +} + CONFIG(desktop) { SUBDIRS += generator generator/generator_tool } !CONFIG(gtool) { - SUBDIRS += anim - SUBDIRS += graphics - SUBDIRS += gui - SUBDIRS += render - SUBDIRS += search - SUBDIRS += map + SUBDIRS *= anim + SUBDIRS *= graphics + SUBDIRS *= gui + SUBDIRS *= render + SUBDIRS *= search + SUBDIRS *= map CONFIG(desktop) { SUBDIRS += qt } - CONFIG(skin-gen) { + CONFIG(map_designer) { SUBDIRS += skin_generator } @@ -83,7 +85,7 @@ CONFIG(desktop) { SUBDIRS += indexer/indexer_tests SUBDIRS += graphics/graphics_tests SUBDIRS += gui/gui_tests - SUBDIRS += integration_tests + SUBDIRS *= integration_tests SUBDIRS += pedestrian_routing_benchmarks SUBDIRS += search/integration_tests |