From 8dd0ee8e5b33c326367387af74d67f3223733887 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Tue, 8 Sep 2015 13:41:34 +0300
Subject: [PATCH] Remove 3party build option

---
 omim.pro | 105 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 50 insertions(+), 55 deletions(-)

diff --git a/omim.pro b/omim.pro
index 68f47db699..042969ad78 100644
--- a/omim.pro
+++ b/omim.pro
@@ -1,11 +1,10 @@
 # Build file for MAPS.ME project
 #
 # Possible options:
-#   3party: build only 3party libraries
 #   gtool: build only generator_tool
 #   skin-gen: build skin-generator tool
 #   no-tests: do not build tests for desktop
-#   drape: include drape libraries (implies no-tests)
+#   drape: include drape libraries
 #   iphone / tizen / android: build an app (implies no-tests)
 
 lessThan(QT_MAJOR_VERSION, 5) {
@@ -32,69 +31,65 @@ CONFIG(designer) {
   CONFIG *= skin-gen
 }
 
-SUBDIRS = 3party
+SUBDIRS = 3party base geometry coding
 
-!CONFIG(3party) {
-  SUBDIRS += base geometry coding
+SUBDIRS += platform
+SUBDIRS += stats
+SUBDIRS += indexer
+SUBDIRS += routing
+SUBDIRS += storage
 
-  SUBDIRS += platform
-  SUBDIRS += stats
-  SUBDIRS += indexer
-  SUBDIRS += routing
-  SUBDIRS += storage
+CONFIG(desktop) {
+  SUBDIRS += generator generator/generator_tool
+}
+
+!CONFIG(gtool) {
+  SUBDIRS += anim
+  SUBDIRS += graphics
+  SUBDIRS += gui
+  SUBDIRS += render
+  SUBDIRS += search
+  SUBDIRS += map
 
   CONFIG(desktop) {
-    SUBDIRS += generator generator/generator_tool
+    SUBDIRS += qt
   }
 
-  !CONFIG(gtool) {
-    SUBDIRS += anim
-    SUBDIRS += graphics
-    SUBDIRS += gui
-    SUBDIRS += render
-    SUBDIRS += search
-    SUBDIRS += map
+  CONFIG(skin-gen) {
+    SUBDIRS += skin_generator
+  }
+
+  CONFIG(drape) {
+    SUBDIRS += drape drape_frontend
 
     CONFIG(desktop) {
-      SUBDIRS += qt
+      SUBDIRS += drape_head
     }
+  }
 
-    CONFIG(skin-gen) {
-      SUBDIRS += skin_generator
-    }
+  CONFIG(desktop):!CONFIG(no-tests) {
+    SUBDIRS += base/base_tests
+    SUBDIRS += coding/coding_tests
+    SUBDIRS += platform/platform_tests_support
+    SUBDIRS += geometry/geometry_tests
+    SUBDIRS += platform/platform_tests
+    SUBDIRS += qt_tstfrm
+    SUBDIRS += render/render_tests
+    SUBDIRS += storage/storage_tests
+    SUBDIRS += search/search_tests
+    SUBDIRS += map/map_tests map/benchmark_tool map/mwm_tests
+    SUBDIRS += routing/routing_tests
+    SUBDIRS += generator/generator_tests
+    SUBDIRS += indexer/indexer_tests
+    SUBDIRS += graphics/graphics_tests
+    SUBDIRS += gui/gui_tests
+    SUBDIRS += integration_tests
+    SUBDIRS += pedestrian_routing_benchmarks
+    SUBDIRS += search/integration_tests
 
     CONFIG(drape) {
-      SUBDIRS += drape drape_frontend
-
-      CONFIG(desktop) {
-        SUBDIRS += drape_head
-      }
+      SUBDIRS += drape/drape_tests
+      SUBDIRS += drape_frontend/drape_frontend_tests
     }
-
-    CONFIG(desktop):!CONFIG(no-tests) {
-      SUBDIRS += base/base_tests
-      SUBDIRS += coding/coding_tests
-      SUBDIRS += platform/platform_tests_support
-      SUBDIRS += geometry/geometry_tests
-      SUBDIRS += platform/platform_tests
-      SUBDIRS += qt_tstfrm
-      SUBDIRS += render/render_tests
-      SUBDIRS += storage/storage_tests
-      SUBDIRS += search/search_tests
-      SUBDIRS += map/map_tests map/benchmark_tool map/mwm_tests
-      SUBDIRS += routing/routing_tests
-      SUBDIRS += generator/generator_tests
-      SUBDIRS += indexer/indexer_tests
-      SUBDIRS += graphics/graphics_tests
-      SUBDIRS += gui/gui_tests
-      SUBDIRS += integration_tests
-      SUBDIRS += pedestrian_routing_benchmarks
-      SUBDIRS += search/integration_tests
-
-      CONFIG(drape) {
-        SUBDIRS += drape/drape_tests
-        SUBDIRS += drape_frontend/drape_frontend_tests
-      }
-    } # !no-tests
-  } # !gtool
-} # !3party
+  } # !no-tests
+} # !gtool