From a743aba0560e97f04c0b91c32675ae9b2e121f4e Mon Sep 17 00:00:00 2001
From: Andrew Shkrob <andrew.shkrob.social@yandex.by>
Date: Thu, 18 May 2023 22:58:43 +0200
Subject: [PATCH] [cmake] Group targets into folders

Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
---
 3party/CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++
 CMakeLists.txt        | 60 ++-----------------------------------------
 2 files changed, 61 insertions(+), 58 deletions(-)
 create mode 100644 3party/CMakeLists.txt

diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
new file mode 100644
index 0000000000..9c9674a1b3
--- /dev/null
+++ b/3party/CMakeLists.txt
@@ -0,0 +1,59 @@
+if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+  # Configure expat library.
+  # Suppress "Policy CMP0077 is not set: option() honors normal variables"
+  # for the expat options below.
+  set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+  set(EXPAT_BUILD_TOOLS OFF)
+  set(EXPAT_BUILD_EXAMPLES OFF)
+  set(EXPAT_BUILD_TESTS OFF)
+  set(EXPAT_BUILD_DOCS OFF)
+  set(EXPAT_BUILD_PKGCONFIG OFF)
+  set(EXPAT_ENABLE_INSTALL OFF)
+  set(EXPAT_SHARED_LIBS OFF)
+  add_subdirectory(expat/expat)
+
+  # Configure Jansson library.
+  set(JANSSON_BUILD_DOCS OFF)
+  set(JANSSON_BUILD_MAN OFF)
+  set(JANSSON_EXAMPLES OFF)
+  set(JANSSON_INSTALL OFF)
+  set(JANSSON_WITHOUT_TESTS ON)
+  add_subdirectory(jansson/jansson/)
+  target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include")
+
+  # Add gflags library.
+  add_subdirectory(gflags)
+  target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
+  # Not needed for the usual build process, but it fixes QtCreator editor,
+  # that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration).
+  if (PLATFORM_DESKTOP)
+    include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
+  endif()
+
+  # Add pugixml library.
+  add_subdirectory(pugixml)
+
+  # Add protobuf library.
+  add_subdirectory(protobuf)
+endif()
+
+add_subdirectory(agg)
+add_subdirectory(bsdiff-courgette)
+
+if (NOT LINUX_DETECTED)
+  add_subdirectory(freetype)
+  add_subdirectory(icu)
+endif()
+
+add_subdirectory(liboauthcpp)
+add_subdirectory(minizip)
+add_subdirectory(opening_hours)
+add_subdirectory(sdf_image)
+add_subdirectory(stb_image)
+add_subdirectory(succinct)
+add_subdirectory(open-location-code)
+add_subdirectory(vulkan_wrapper)
+
+if (PLATFORM_DESKTOP)
+  add_subdirectory(libtess2)
+endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62561f5b9e..34978954ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -290,69 +290,13 @@ if (USE_PCH)
     ${OMIM_PCH_TARGET_NAME}
   )
 endif()
+
 # Include 3party dependencies.
-
-if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
-  # Configure expat library.
-  # Suppress "Policy CMP0077 is not set: option() honors normal variables"
-  # for the expat options below.
-  set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-  set(EXPAT_BUILD_TOOLS OFF)
-  set(EXPAT_BUILD_EXAMPLES OFF)
-  set(EXPAT_BUILD_TESTS OFF)
-  set(EXPAT_BUILD_DOCS OFF)
-  set(EXPAT_BUILD_PKGCONFIG OFF)
-  set(EXPAT_ENABLE_INSTALL OFF)
-  set(EXPAT_SHARED_LIBS OFF)
-  add_subdirectory(3party/expat/expat)
-
-  # Configure Jansson library.
-  set(JANSSON_BUILD_DOCS OFF)
-  set(JANSSON_BUILD_MAN OFF)
-  set(JANSSON_EXAMPLES OFF)
-  set(JANSSON_INSTALL OFF)
-  set(JANSSON_WITHOUT_TESTS ON)
-  add_subdirectory(3party/jansson/jansson/)
-  target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include")
-
-  # Add gflags library.
-  add_subdirectory(3party/gflags)
-  target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
-  # Not needed for the usual build process, but it fixes QtCreator editor,
-  # that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration).
-  if (PLATFORM_DESKTOP)
-    include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
-  endif()
-
-  # Add pugixml library.
-  add_subdirectory(3party/pugixml)
-
-  # Add protobuf library.
-  add_subdirectory(${OMIM_ROOT}/3party/protobuf)
-endif()
-
-add_subdirectory(3party/agg)
-add_subdirectory(3party/bsdiff-courgette)
+add_subdirectory(3party)
 
 if (LINUX_DETECTED)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
-else()
-  add_subdirectory(3party/freetype)
-  add_subdirectory(3party/icu)
-endif()
-
-add_subdirectory(3party/liboauthcpp)
-add_subdirectory(3party/minizip)
-add_subdirectory(3party/opening_hours)
-add_subdirectory(3party/sdf_image)
-add_subdirectory(3party/stb_image)
-add_subdirectory(3party/succinct)
-add_subdirectory(3party/open-location-code)
-add_subdirectory(3party/vulkan_wrapper)
-
-if (PLATFORM_DESKTOP)
-  add_subdirectory(3party/libtess2)
 endif()
 
 find_package(Python3 COMPONENTS Interpreter)