From 03f10444074fffaf8624b0efa7b442a491c44d51 Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Mon, 15 Jan 2018 13:22:28 +0300
Subject: [PATCH] [build] Fixed ASAN build.

This commit moves ASAN/TSAN compile options before any 3party
subdirectories, to prevent build of std library with and without
instrumentation under the same hood.
---
 CMakeLists.txt    | 58 +++++++++++++++++++++++------------------------
 map/framework.cpp |  7 ------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dcd44bb90..9f8a07ad8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,19 +331,6 @@ endfunction()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Include subdirectories
-add_subdirectory(3party/jansson)
-add_subdirectory(3party/minizip)
-add_subdirectory(3party/freetype)
-add_subdirectory(3party/icu)
-add_subdirectory(3party/agg)
-add_subdirectory(3party/expat)
-add_subdirectory(map)
-
-if (PLATFORM_DESKTOP)
-  add_subdirectory(3party/libtess2)
-endif()
-
 add_compile_options(
   "-Wall"
 )
@@ -364,40 +351,51 @@ if (USE_TSAN)
   )
 endif()
 
-add_subdirectory(3party/stb_image)
-add_subdirectory(3party/sdf_image)
-add_subdirectory(3party/protobuf)
-add_subdirectory(3party/liboauthcpp)
-add_subdirectory(3party/pugixml)
-add_subdirectory(3party/succinct)
-add_subdirectory(3party/gflags)
+# Include subdirectories
+add_subdirectory(3party/agg)
 add_subdirectory(3party/bsdiff-courgette)
+add_subdirectory(3party/expat)
+add_subdirectory(3party/freetype)
+add_subdirectory(3party/gflags)
+add_subdirectory(3party/icu)
+add_subdirectory(3party/jansson)
+add_subdirectory(3party/liboauthcpp)
+add_subdirectory(3party/minizip)
+add_subdirectory(3party/opening_hours)
+add_subdirectory(3party/protobuf)
+add_subdirectory(3party/pugixml)
+add_subdirectory(3party/sdf_image)
+add_subdirectory(3party/stb_image)
+add_subdirectory(3party/succinct)
+
 add_subdirectory(base)
 add_subdirectory(coding)
-add_subdirectory(generator/mwm_diff)
-add_subdirectory(geometry)
-add_subdirectory(platform)
-add_subdirectory(3party/opening_hours)
-add_subdirectory(stats)
 add_subdirectory(drape)
 add_subdirectory(drape_frontend)
-add_subdirectory(storage)
 add_subdirectory(editor)
+add_subdirectory(generator/mwm_diff)
+add_subdirectory(geometry)
 add_subdirectory(indexer)
+add_subdirectory(local_ads)
+add_subdirectory(map)
+add_subdirectory(partners_api)
+add_subdirectory(platform)
 add_subdirectory(routing)
 add_subdirectory(routing_common)
 add_subdirectory(search)
+add_subdirectory(stats)
+add_subdirectory(storage)
 add_subdirectory(tracking)
 add_subdirectory(traffic)
 add_subdirectory(transit)
-add_subdirectory(partners_api)
-add_subdirectory(local_ads)
 add_subdirectory(ugc)
 
 if (PLATFORM_DESKTOP)
+  add_subdirectory(3party/libtess2)
+
   if (BUILD_MAPSHOT)
-    add_subdirectory(software_renderer)
     add_subdirectory(mapshot)
+    add_subdirectory(software_renderer)
   endif()
   add_subdirectory(feature_list)
   add_subdirectory(generator)
@@ -409,8 +407,8 @@ if (PLATFORM_DESKTOP)
   endif()
 endif()
 
-omim_add_test_subdirectory(qt_tstfrm)
 omim_add_test_subdirectory(3party/gmock)
+omim_add_test_subdirectory(qt_tstfrm)
 
 if (PLATFORM_ANDROID)
   add_subdirectory(android/jni)
diff --git a/map/framework.cpp b/map/framework.cpp
index 91b6a0d1c0..d39f21fb85 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -177,13 +177,6 @@ string MakeSearchBookingUrl(booking::Api const & bookingApi, search::CityFinder
 
   return bookingApi.GetSearchUrl(city, name);
 }
-
-bool IsCianMode(string query)
-{
-  strings::Trim(query);
-  strings::AsciiToLower(query);
-  return query == "cian";
-}
 }  // namespace
 
 pair<MwmSet::MwmId, MwmSet::RegResult> Framework::RegisterMap(