diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d3acdd3a4..d22c7e86d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ if (PLATFORM_LINUX OR PLATFORM_MAC OR PLATFORM_WIN)
 else()
   set(PLATFORM_DESKTOP FALSE)
 endif()
+
 # End of setting the target platform
 
 # Set build type:
@@ -76,6 +77,7 @@ option(USE_ASAN "Enable Address Sanitizer" OFF)
 option(USE_TSAN "Enable Thread Sanitizer" OFF)
 option(PYBINDINGS "Create makefiles for building python bindings" OFF)
 option(SKIP_DESKTOP "Skip building of desktop application" OFF)
+option(BUILD_MAPSHOT "Build mapshot tool" OFF)
 
 if (PLATFORM_LINUX)
   option(USE_PPROF "Enable Google Profiler" OFF)
@@ -175,13 +177,14 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
     message(FATAL_ERROR "Qt5 cmake files were not found, please set QT_PATH environment variable")
   endif()
   if (Qt5Core_VERSION VERSION_LESS 5.5.0)
-        message(FATAL_ERROR "Minimum supported Qt5 version is 5.5")
+    message(FATAL_ERROR "Minimum supported Qt5 version is 5.5")
   endif()
   find_package(Qt5Network REQUIRED)
+  if (NOT SKIP_DESKTOP OR NOT SKIP_TESTS)
+    find_package(Qt5Widgets)
+  endif()
   if (NOT SKIP_DESKTOP)
     find_qt5_desktop_package(Qt5Gui)
-    find_qt5_desktop_package(Qt5OpenGL)
-    find_qt5_desktop_package(Qt5Widgets)
     find_qt5_desktop_package(Qt5Xml)
     find_qt5_desktop_package(Qt5Svg)
     find_qt5_desktop_package(Qt5WebEngineWidgets)
@@ -391,8 +394,6 @@ add_subdirectory(partners_api)
 add_subdirectory(local_ads)
 add_subdirectory(ugc)
 
-option(BUILD_MAPSHOT "Build mapshot tool" OFF)
-
 if (PLATFORM_DESKTOP)
   if (BUILD_MAPSHOT)
     add_subdirectory(software_renderer)
@@ -401,17 +402,16 @@ if (PLATFORM_DESKTOP)
   add_subdirectory(feature_list)
   add_subdirectory(generator)
   add_subdirectory(openlr)
-  add_subdirectory(skin_generator)
   add_subdirectory(track_analyzing)
+  if (NOT SKIP_DESKTOP)
+    add_subdirectory(qt)
+    add_subdirectory(skin_generator)
+  endif()
 endif()
 
 omim_add_test_subdirectory(qt_tstfrm)
 omim_add_test_subdirectory(3party/gmock)
 
-if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID AND NOT SKIP_DESKTOP)
-    add_subdirectory(qt)
-endif()
-
 if (PLATFORM_ANDROID)
   add_subdirectory(android/jni)
 endif()
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 36436b85a7..e2f13ca4bb 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -112,10 +112,7 @@ add_library(${PROJECT_NAME} ${SRC})
 omim_add_test_subdirectory(generator_tests_support)
 omim_add_test_subdirectory(generator_tests)
 
-if (NOT SKIP_GTOOL)
-  add_subdirectory(generator_tool)
-endif()
-
+add_subdirectory(generator_tool)
 add_subdirectory(booking_quality_check)
 add_subdirectory(feature_segments_checker)
 add_subdirectory(restaurants_info)
diff --git a/openlr/openlr_match_quality/CMakeLists.txt b/openlr/openlr_match_quality/CMakeLists.txt
index 51db338865..604fa3758c 100644
--- a/openlr/openlr_match_quality/CMakeLists.txt
+++ b/openlr/openlr_match_quality/CMakeLists.txt
@@ -1,3 +1,5 @@
 project(openlr_match_quality)
 
-add_subdirectory(openlr_assessment_tool)
+if (NOT SKIP_DESKTOP)
+  add_subdirectory(openlr_assessment_tool)
+endif()
diff --git a/search/search_quality/CMakeLists.txt b/search/search_quality/CMakeLists.txt
index d035503eda..8fc60148e7 100644
--- a/search/search_quality/CMakeLists.txt
+++ b/search/search_quality/CMakeLists.txt
@@ -13,7 +13,10 @@ set(SRC
 
 add_library(${PROJECT_NAME} ${SRC})
 
-add_subdirectory(assessment_tool)
+if (NOT SKIP_DESKTOP)
+  add_subdirectory(assessment_tool)
+endif()
+
 add_subdirectory(features_collector_tool)
 add_subdirectory(search_quality_tool)
 omim_add_test_subdirectory(search_quality_tests)