New cpp folder structure

Signed-off-by: Alexander Borsuk <[email protected]>

Author: biodranik

CMakeLists.txt

@@ -161,7 +161,7 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
 endif()
 
 # To allow #include "base/file_name.hpp" in all sources.
-include_directories(${CMAKE_HOME_DIRECTORY})
+include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
 
 if (USE_PCH)
   message(STATUS "Precompiled headers are ON")
@@ -203,45 +203,18 @@ endif()
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
-add_subdirectory(base)
-add_subdirectory(coding)
-add_subdirectory(descriptions)
-add_subdirectory(drape)
-add_subdirectory(drape_frontend)
-add_subdirectory(editor)
-add_subdirectory(ge0)
-add_subdirectory(generator/mwm_diff)
-add_subdirectory(geometry)
-add_subdirectory(indexer)
-add_subdirectory(kml)
-add_subdirectory(map)
-add_subdirectory(cppjansson)
-add_subdirectory(platform)
-add_subdirectory(routing)
-add_subdirectory(routing_common)
-add_subdirectory(search)
-add_subdirectory(shaders)
-add_subdirectory(storage)
-add_subdirectory(tracking)
-add_subdirectory(traffic)
-add_subdirectory(transit)
+add_subdirectory(libs)
 
 if (PLATFORM_DESKTOP)
-  omim_add_tool_subdirectory(feature_list)
+  add_subdirectory(dev_sandbox)
   add_subdirectory(generator)
-  add_subdirectory(openlr)
-  add_subdirectory(poly_borders)
-  omim_add_tool_subdirectory(topography_generator)
-  add_subdirectory(track_analyzing)
-  omim_add_tool_subdirectory(track_generator)
+  add_subdirectory(tools)
   if (NOT SKIP_QT_GUI)
     add_subdirectory(qt)
-    omim_add_tool_subdirectory(skin_generator)
   endif()
-  add_subdirectory(dev_sandbox)
 endif()
 
-omim_add_test_subdirectory(qt_tstfrm)
+omim_add_test_subdirectory(libs/qt_tstfrm)
 
 if (PLATFORM_ANDROID)
   add_subdirectory(android/sdk/src/main/cpp)

cmake/OmimTesting.cmake

@@ -51,7 +51,7 @@ endfunction()
 function(omim_add_test_target name src no_platform_init require_qt boost_test)
   omim_add_executable(${name}
     ${src}
-    $<$<NOT:$<BOOL:${boost_test}>>:${OMIM_ROOT}/testing/testingmain.cpp>
+    $<$<NOT:$<BOOL:${boost_test}>>:${OMIM_ROOT}/libs/testing/testingmain.cpp>
   )
   target_compile_options(${name} PRIVATE ${OMIM_WARNING_FLAGS})
   target_include_directories(${name} PRIVATE ${OMIM_INCLUDE_DIRS})

dev_sandbox/CMakeLists.txt

@@ -13,7 +13,7 @@ if (${PLATFORM_MAC})
     ../iphone/Maps/Classes/MetalContextFactory.mm
   )
 
-  file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/shaders/Metal/*.metal)
+  file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/libs/shaders/Metal/*.metal)
   add_metal_shader_library(shaders_metal
     ${SHADER_SOURCES_FILES}
   )

libs/CMakeLists.txt

@@ -0,0 +1,22 @@
+add_subdirectory(base)
+add_subdirectory(coding)
+add_subdirectory(descriptions)
+add_subdirectory(drape)
+add_subdirectory(drape_frontend)
+add_subdirectory(editor)
+add_subdirectory(ge0)
+add_subdirectory(mwm_diff)
+add_subdirectory(geometry)
+add_subdirectory(indexer)
+add_subdirectory(kml)
+add_subdirectory(map)
+add_subdirectory(cppjansson)
+add_subdirectory(platform)
+add_subdirectory(routing)
+add_subdirectory(routing_common)
+add_subdirectory(search)
+add_subdirectory(shaders)
+add_subdirectory(storage)
+add_subdirectory(tracking)
+add_subdirectory(traffic)
+add_subdirectory(transit)