From 3d164a77cb1057e982f3217a505cb21eadf46535 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 13 Mar 2016 18:22:35 +0100
Subject: SelfTests: Organized into solution folders.

---
 CMakeLists.txt                      | 21 ---------------------
 tests/ChunkData/CMakeLists.txt      | 17 +++++++++++++++++
 tests/HTTP/CMakeLists.txt           | 13 +++++++++++++
 tests/LoadablePieces/CMakeLists.txt |  5 +++++
 tests/Network/CMakeLists.txt        |  6 +++++-
 5 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17644e86c..02de722bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,27 +264,6 @@ if (MSVC)
 		tolua
 		PROPERTIES FOLDER Support
 	)
-	if (${SELF_TEST})
-		set_target_properties(
-			Network
-			HTTP
-			PROPERTIES FOLDER Lib
-		)
-		set_target_properties(
-			arraystocoords-exe
-			ChunkBuffer
-			coordinates-exe
-			copies-exe
-			copyblocks-exe
-			creatable-exe
-			EchoServer
-			Google-exe
-			HTTPMessageParser_file-exe
-			LoadablePieces
-			NameLookup
-			PROPERTIES FOLDER Tests
-		)
-	endif()
 
 	if(${BUILD_TOOLS})
 		set_target_properties(
diff --git a/tests/ChunkData/CMakeLists.txt b/tests/ChunkData/CMakeLists.txt
index bd2d6d9b4..8c1b10e9f 100644
--- a/tests/ChunkData/CMakeLists.txt
+++ b/tests/ChunkData/CMakeLists.txt
@@ -33,3 +33,20 @@ add_test(NAME arraystocoords-test COMMAND arraystocoords-exe)
 add_executable(copyblocks-exe CopyBlocks.cpp)
 target_link_libraries(copyblocks-exe ChunkBuffer)
 add_test(NAME copyblocks-test COMMAND copyblocks-exe)
+
+
+
+
+# Put all test projects into a separate folder:
+set_target_properties(
+	arraystocoords-exe
+	coordinates-exe
+	copies-exe
+	copyblocks-exe
+	creatable-exe
+	PROPERTIES FOLDER Tests/ChunkData
+)
+set_target_properties(
+	ChunkBuffer
+	PROPERTIES FOLDER Lib
+)
diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt
index 233e5c0cb..55552c095 100644
--- a/tests/HTTP/CMakeLists.txt
+++ b/tests/HTTP/CMakeLists.txt
@@ -58,3 +58,16 @@ add_test(NAME HTTPMessageParser_file-test3-2 COMMAND HTTPMessageParser_file-exe
 # Test parsing the request file in 512-byte chunks (should process everything in a single call):
 add_test(NAME HTTPMessageParser_file-test4-512 COMMAND HTTPMessageParser_file-exe HTTPRequest1.data 512)
 
+
+
+
+
+# Put all the tests into a solution folder (MSVC):
+set_target_properties(
+	HTTPMessageParser_file-exe
+	PROPERTIES FOLDER Tests
+)
+set_target_properties(
+	HTTP
+	PROPERTIES FOLDER Lib
+)
diff --git a/tests/LoadablePieces/CMakeLists.txt b/tests/LoadablePieces/CMakeLists.txt
index 16a89633a..c467d7c38 100644
--- a/tests/LoadablePieces/CMakeLists.txt
+++ b/tests/LoadablePieces/CMakeLists.txt
@@ -98,3 +98,8 @@ add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 
 
 
+# Put the projects into solution folders (MSVC):
+set_target_properties(
+	LoadablePieces
+	PROPERTIES FOLDER Tests
+)
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index e47b01e11..2e0915cca 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -78,7 +78,11 @@ set_target_properties(
 	Google-exe
 	NameLookup
 	EnumInterfaces-exe
-	PROPERTIES FOLDER Tests
+	PROPERTIES FOLDER Tests/Network
+)
+set_target_properties(
+	Network
+	PROPERTIES FOLDER Lib
 )
 
 
-- 
cgit v1.2.3