From c536dc76ca6522b41a4758676fa40996e707b74b Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 10 Sep 2015 21:10:50 +0300
Subject: [PATCH] Update omim.pro, include int_tests to gtool

---
 common.pri |  5 +++++
 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
diff --git a/omim.pro b/omim.pro
index 042969ad78..f9698d78bc 100644
--- a/omim.pro
+++ b/omim.pro
@@ -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