From a35fa30ce1b831304b5386872368a28a46650b02 Mon Sep 17 00:00:00 2001
From: Alex Cristici <alex.cristici@gmail.com>
Date: Fri, 7 Apr 2023 01:54:48 +0300
Subject: [PATCH] Organize source code based on tree folders (#987)

---
 CMakeLists.txt         | 22 +++++++++++++++++-----
 platform/ios/ios.cmake | 27 +++++++++++++++++++--------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b02c5f01..67a3e907c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,8 +112,8 @@ if(MBGL_WITH_QT AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
 else()
     add_library(mbgl-core STATIC)
 endif()
-target_sources(
-    mbgl-core PRIVATE
+
+list(APPEND INCLUDE_FILES
     ${PROJECT_SOURCE_DIR}/include/mbgl/actor/actor.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/actor/actor_ref.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/actor/aspiring_actor.hpp
@@ -305,6 +305,8 @@ target_sources(
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_request.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task_impl.hpp
+)
+list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mbgl/actor/mailbox.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/actor/scheduler.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/algorithm/update_renderables.hpp
@@ -858,9 +860,8 @@ if(MBGL_WITH_OPENGL)
         mbgl-core
         PRIVATE MBGL_RENDER_BACKEND_OPENGL=1
     )
-    target_sources(
-        mbgl-core
-        PRIVATE
+    list(APPEND 
+        INCLUDE_FILES
             ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend.hpp
             ${PROJECT_SOURCE_DIR}/include/mbgl/gl/custom_layer.hpp
             ${PROJECT_SOURCE_DIR}/include/mbgl/gl/custom_layer_factory.hpp
@@ -898,6 +899,9 @@ if(MBGL_WITH_OPENGL)
             ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/gl/symbol_sdf_text.hpp
             ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/gl/symbol_sdf_icon.hpp
             ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/gl/symbol_text_and_icon.hpp
+    )
+    list(APPEND 
+        SRC_FILES
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/attribute.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/attribute.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/command_encoder.cpp
@@ -958,6 +962,14 @@ if(MBGL_WITH_OPENGL)
     )
 endif()
 
+target_sources(
+    mbgl-core PRIVATE
+    ${INCLUDE_FILES}
+    ${SRC_FILES}
+)
+source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${INCLUDE_FILES})
+source_group(TREE ${PROJECT_SOURCE_DIR}/src FILES ${SRC_FILES})
+
 if(EXISTS ${PROJECT_SOURCE_DIR}/.git/HEAD)
     execute_process(
         COMMAND
diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake
index a19f53eef..b41672932 100644
--- a/platform/ios/ios.cmake
+++ b/platform/ios/ios.cmake
@@ -27,11 +27,11 @@ if(MBGL_WITH_OPENGL)
         mbgl-core
         PUBLIC MBGL_USE_GLES2 GLES_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION
     )
-    target_sources(
-        mbgl-core
-        PRIVATE
+    list(APPEND 
+        PLATFORM_FILES
             ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gl/headless_backend.cpp
-            ${PROJECT_SOURCE_DIR}/platform/darwin/src/gl_functions.cpp ${PROJECT_SOURCE_DIR}/platform/darwin/src/headless_backend_eagl.mm
+            ${PROJECT_SOURCE_DIR}/platform/darwin/src/gl_functions.cpp 
+            ${PROJECT_SOURCE_DIR}/platform/darwin/src/headless_backend_eagl.mm
     )
     target_link_libraries(
         mbgl-core
@@ -39,12 +39,17 @@ if(MBGL_WITH_OPENGL)
     )
 endif()
 
-target_sources(
-    mbgl-core
-    PRIVATE
+if(MBGL_PUBLIC_BUILD)
+    list(APPEND 
+        PLATFORM_FILES
+            ${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
+    )
+endif()
+
+list(APPEND 
+    PLATFORM_FILES
         ${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp
         ${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm
-        $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm>
         ${PROJECT_SOURCE_DIR}/platform/darwin/src/image.mm
         ${PROJECT_SOURCE_DIR}/platform/darwin/src/local_glyph_rasterizer.mm
         ${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm
@@ -80,6 +85,12 @@ target_sources(
         ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/utf.cpp
 )
 
+target_sources(
+    mbgl-core PRIVATE
+    ${PLATFORM_FILES}
+)
+source_group(TREE ${PROJECT_SOURCE_DIR} FILES ${PLATFORM_FILES})
+
 target_include_directories(
     mbgl-core
     PRIVATE ${PROJECT_SOURCE_DIR}/platform/darwin/include ${PROJECT_SOURCE_DIR}/platform/default/include