10 files changed, 23 insertions, 76 deletions
diff --git a/3party/jansson/CMakeLists.txt b/3party/jansson/CMakeLists.txt
index 8594823bf7..17b20e92ee 100644
--- a/3party/jansson/CMakeLists.txt
+++ b/3party/jansson/CMakeLists.txt
@@ -1,15 +1,8 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(jansson C CXX)
+project(jansson)
 
 include_directories(src ../../)
 
-add_compile_options(
-  "-Wall"
-  "-Wno-unused-function"
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+append(CMAKE_CXX_FLAGS "-std=c++11")
 
 
 set(
@@ -35,4 +28,4 @@ set(
   src/value.c
 )
 
-add_library(jansson ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/liboauthcpp/CMakeLists.txt b/3party/liboauthcpp/CMakeLists.txt
index c0a86f5225..1236a7cda2 100644
--- a/3party/liboauthcpp/CMakeLists.txt
+++ b/3party/liboauthcpp/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(oauthcpp C CXX)
-
-add_compile_options(
-  "-Wall"
-  "-std=c++11"
-)
+project(oauthcpp)
 
 include_directories(include src)
 
@@ -19,4 +12,4 @@ set(
   src/liboauthcpp.cpp
 )
 
-add_library(oauthcpp ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt
index 7fad4f1c66..132fefaf56 100644
--- a/3party/minizip/CMakeLists.txt
+++ b/3party/minizip/CMakeLists.txt
@@ -1,10 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(minizip C CXX)
-
-add_compile_options(
-  "-Wall"
-)
+project(minizip)
 
 add_definitions(-DUSE_FILE32ZPI -DNOCRYPT)
 
@@ -18,4 +12,4 @@ set(
   zip.h
 )
 
-add_library(minizip ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt
index 25463c597b..aef7d8c2cd 100644
--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -1,19 +1,11 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(protobuf C CXX)
+project(protobuf)
 
 include_directories(. src ../../)
 
-add_compile_options(
-  "-Wall"
-  "-std=c++11"
-)
-
 if (NOT PLATFORM_WIN)
   add_definitions(-DHAVE_PTHREAD)
 endif ()
 
-
 set(
   SRC
   config.h
@@ -56,19 +48,17 @@ set(
 )
 
 if (PLATFORM_LINUX OR PLATFORM_ANDROID OR (PLATFORM_WIN AND NOT MSVC))
-  set(
+  append(
     SRC
-    ${SRC}
     src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
   )
 endif()
 
 if (PLATFORM_WIN AND MSVC)
-  set(
+  append(
     SRC
-    ${SRC}
     src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
   )
 endif()
 
-add_library(protobuf ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/pugixml/CMakeLists.txt b/3party/pugixml/CMakeLists.txt
index 7d446af551..64be298433 100644
--- a/3party/pugixml/CMakeLists.txt
+++ b/3party/pugixml/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(pugixml C CXX)
-
-add_compile_options(
-  "-Wall"
-  "-std=c++11"
-)
+project(pugixml)
 
 include_directories(src)
 
@@ -16,4 +9,4 @@ set(
   src/pugiconfig.hpp
 )
 
-add_library(pugixml ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/succinct/CMakeLists.txt b/3party/succinct/CMakeLists.txt
index f04e33b210..30ee3eedf5 100644
--- a/3party/succinct/CMakeLists.txt
+++ b/3party/succinct/CMakeLists.txt
@@ -1,11 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(succinct C CXX)
-
-add_compile_options(
-  "-Wall"
-  "-std=c++11"
-)
+project(succinct)
 
 add_definitions(-DLTC_NO_ROLC)
 
@@ -38,4 +31,4 @@ set(
   vbyte.hpp
 )
 
-add_library(succinct ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/3party/tomcrypt/CMakeLists.txt b/3party/tomcrypt/CMakeLists.txt
index b78407ef83..7bf82e9bb8 100644
--- a/3party/tomcrypt/CMakeLists.txt
+++ b/3party/tomcrypt/CMakeLists.txt
@@ -1,10 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(tomcrypt C CXX)
-
-add_compile_options(
-  "-Wall"
-)
+project(tomcrypt)
 
 add_definitions(-DLTC_NO_ROLC)
 
@@ -20,4 +14,4 @@ set(
   src/misc/crypt/crypt_argchk.c
 )
 
-add_library(tomcrypt ${SRC})
+add_library(${PROJECT_NAME} ${SRC})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5141250c06..442c92d28a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,17 +131,18 @@ endmacro()
 # Include subdirectories
 add_subdirectory(3party/jansson)
 add_subdirectory(3party/minizip)
-add_subdirectory(3party/liboauthcpp)
-add_subdirectory(3party/pugixml)
-add_subdirectory(3party/succinct)
 add_subdirectory(3party/tomcrypt)
-add_subdirectory(3party/protobuf)
 
 add_compile_options(
   "-Wall"
   "-std=c++11"
 )
 
+add_subdirectory(3party/protobuf)
+add_subdirectory(3party/liboauthcpp)
+add_subdirectory(3party/pugixml)
+add_subdirectory(3party/succinct)
+
 add_subdirectory(base)
 add_subdirectory(coding)
 add_subdirectory(geometry)
diff --git a/search/search_tests_support/CMakeLists.txt b/search/search_tests_support/CMakeLists.txt
index 073df9b3f0..bebe7ac592 100644
--- a/search/search_tests_support/CMakeLists.txt
+++ b/search/search_tests_support/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(search_tests_support)
 
-add_compile_options(
-  "-Wall"
-  "-std=c++11"
-)
-
 set(
   SRC
   test_results_matching.cpp
diff --git a/tracking/tracking_tests/CMakeLists.txt b/tracking/tracking_tests/CMakeLists.txt
index 226740f160..7e961a1c51 100644
--- a/tracking/tracking_tests/CMakeLists.txt
+++ b/tracking/tracking_tests/CMakeLists.txt
@@ -7,6 +7,7 @@ set(
 )
 
 omim_add_test(${PROJECT_NAME} ${SRC})
+
 omim_link_libraries(
   ${PROJECT_NAME}
   tracking platform