From 293dd66203b05e117e2bf8a2f72832ae93384cdc Mon Sep 17 00:00:00 2001
From: Evgeny Gorodetsky <evsgor@gmail.com>
Date: Thu, 12 Sep 2024 22:29:33 +0300
Subject: [PATCH] Put remaining targets under folders in Visual Studio

---
 Externals/CLI11.cmake                    | 5 +++++
 Externals/Catch2.cmake                   | 5 +++++
 Externals/DirectXHeaders.cmake           | 5 +++++
 Externals/TaskFlow.cmake                 | 2 +-
 Modules/Graphics/RHI/Impl/CMakeLists.txt | 7 +++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Externals/CLI11.cmake b/Externals/CLI11.cmake
index 81879c9a1..e1966855b 100644
--- a/Externals/CLI11.cmake
+++ b/Externals/CLI11.cmake
@@ -3,3 +3,8 @@ CPMAddPackage(
     GITHUB_REPOSITORY MethanePowered/CLI11
     VERSION 2.3.2
 )
+
+set_target_properties(CLI11
+    PROPERTIES
+    FOLDER Externals
+)
diff --git a/Externals/Catch2.cmake b/Externals/Catch2.cmake
index 88c8e4daa..6d9acea39 100644
--- a/Externals/Catch2.cmake
+++ b/Externals/Catch2.cmake
@@ -6,6 +6,11 @@ CPMAddPackage(
 
 list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
 
+set_target_properties(Catch2 Catch2WithMain
+    PROPERTIES
+    FOLDER Externals
+)
+
 # Catch2 headers produce build errors with GCC <= 9, which are muted here
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # GCC
     target_compile_options(Catch2
diff --git a/Externals/DirectXHeaders.cmake b/Externals/DirectXHeaders.cmake
index 48e355abb..7ca4bb1fa 100644
--- a/Externals/DirectXHeaders.cmake
+++ b/Externals/DirectXHeaders.cmake
@@ -3,3 +3,8 @@ CPMAddPackage(
     GITHUB_REPOSITORY MethanePowered/DirectXHeaders
     VERSION 1.608.2b
 )
+
+set_target_properties(DirectX-Headers DirectX-Guids
+    PROPERTIES
+    FOLDER Externals
+)
diff --git a/Externals/TaskFlow.cmake b/Externals/TaskFlow.cmake
index 2d7c9f282..e01485a7d 100644
--- a/Externals/TaskFlow.cmake
+++ b/Externals/TaskFlow.cmake
@@ -23,4 +23,4 @@ else() # Clang or GCC
     target_compile_options(Taskflow INTERFACE
         -Wno-shorten-64-to-32 # implicit conversion loses integer precision: 'unsigned long' to 'int' (taskflow/core/observer.hpp:568:24)
     )
-endif()
\ No newline at end of file
+endif()
diff --git a/Modules/Graphics/RHI/Impl/CMakeLists.txt b/Modules/Graphics/RHI/Impl/CMakeLists.txt
index 9f862b46c..9ca228483 100644
--- a/Modules/Graphics/RHI/Impl/CMakeLists.txt
+++ b/Modules/Graphics/RHI/Impl/CMakeLists.txt
@@ -220,4 +220,11 @@ if(METHANE_TESTS_BUILD_ENABLED)
         )
     endif()
 
+    set_target_properties(${TEST_TARGET}
+        PROPERTIES
+        FOLDER Modules/Graphics/RHI
+        UNITY_BUILD ${METHANE_UNITY_BUILD_ENABLED}
+        UNITY_BUILD_BATCH_SIZE 4
+    )
+
 endif() # METHANE_TESTS_BUILD_ENABLED