From 42679ee0bcf2343900d8334a597ffe6b23d0c0b9 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Mon, 30 Oct 2017 07:30:18 -0700
Subject: [PATCH] Tidy up project folders in CMakeLists.txt

---
 CHANGELOG.md                                          | 6 ++++++
 example/advanced/server-flex/CMakeLists.txt           | 2 ++
 example/advanced/server/CMakeLists.txt                | 2 ++
 example/echo-op/CMakeLists.txt                        | 2 ++
 example/http/client/async-ssl/CMakeLists.txt          | 2 ++
 example/http/client/async/CMakeLists.txt              | 2 ++
 example/http/client/coro-ssl/CMakeLists.txt           | 2 ++
 example/http/client/coro/CMakeLists.txt               | 4 +++-
 example/http/client/crawl/CMakeLists.txt              | 2 ++
 example/http/client/sync-ssl/CMakeLists.txt           | 2 ++
 example/http/client/sync/CMakeLists.txt               | 2 ++
 example/http/server/async-ssl/CMakeLists.txt          | 2 ++
 example/http/server/async/CMakeLists.txt              | 2 ++
 example/http/server/coro-ssl/CMakeLists.txt           | 2 ++
 example/http/server/coro/CMakeLists.txt               | 2 ++
 example/http/server/fast/CMakeLists.txt               | 2 ++
 example/http/server/flex/CMakeLists.txt               | 2 ++
 example/http/server/small/CMakeLists.txt              | 2 ++
 example/http/server/stackless-ssl/CMakeLists.txt      | 2 ++
 example/http/server/stackless/CMakeLists.txt          | 2 ++
 example/http/server/sync-ssl/CMakeLists.txt           | 3 +++
 example/http/server/sync/CMakeLists.txt               | 2 ++
 example/websocket/client/async-ssl/CMakeLists.txt     | 2 ++
 example/websocket/client/async/CMakeLists.txt         | 2 ++
 example/websocket/client/coro-ssl/CMakeLists.txt      | 2 ++
 example/websocket/client/coro/CMakeLists.txt          | 2 ++
 example/websocket/client/sync-ssl/CMakeLists.txt      | 2 ++
 example/websocket/client/sync/CMakeLists.txt          | 2 ++
 example/websocket/server/async-ssl/CMakeLists.txt     | 2 ++
 example/websocket/server/async/CMakeLists.txt         | 2 ++
 example/websocket/server/coro-ssl/CMakeLists.txt      | 2 ++
 example/websocket/server/coro/CMakeLists.txt          | 2 ++
 example/websocket/server/fast/CMakeLists.txt          | 2 ++
 example/websocket/server/stackless-ssl/CMakeLists.txt | 2 ++
 example/websocket/server/stackless/CMakeLists.txt     | 2 ++
 example/websocket/server/sync-ssl/CMakeLists.txt      | 2 ++
 example/websocket/server/sync/CMakeLists.txt          | 2 ++
 test/beast/CMakeLists.txt                             | 2 ++
 test/beast/core/CMakeLists.txt                        | 2 ++
 test/beast/http/CMakeLists.txt                        | 2 ++
 test/beast/websocket/CMakeLists.txt                   | 2 ++
 test/beast/zlib/CMakeLists.txt                        | 2 ++
 test/bench/buffers/CMakeLists.txt                     | 2 ++
 test/bench/parser/CMakeLists.txt                      | 2 ++
 test/bench/utf8_checker/CMakeLists.txt                | 2 ++
 test/bench/wsload/CMakeLists.txt                      | 2 ++
 test/bench/zlib/CMakeLists.txt                        | 2 ++
 test/doc/CMakeLists.txt                               | 2 ++
 test/example/common/CMakeLists.txt                    | 2 ++
 49 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 034a8991..b4c51b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 132:
+
+* Tidy up project folders in CMakeLists.txt
+
+--------------------------------------------------------------------------------
+
 Version 131:
 
 * basic_fields returns const values
diff --git a/example/advanced/server-flex/CMakeLists.txt b/example/advanced/server-flex/CMakeLists.txt
index 00697288..f2da0f05 100644
--- a/example/advanced/server-flex/CMakeLists.txt
+++ b/example/advanced/server-flex/CMakeLists.txt
@@ -21,6 +21,8 @@ if (OPENSSL_FOUND)
         advanced_server_flex.cpp
     )
 
+    set_property(TARGET advanced-server-flex PROPERTY FOLDER "example-advanced-server")
+    
     target_link_libraries (advanced-server-flex
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/advanced/server/CMakeLists.txt b/example/advanced/server/CMakeLists.txt
index 93aa415b..c00f7cb9 100644
--- a/example/advanced/server/CMakeLists.txt
+++ b/example/advanced/server/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (advanced-server
     Jamfile
     advanced_server.cpp
 )
+
+set_property(TARGET advanced-server PROPERTY FOLDER "example-advanced-server")
diff --git a/example/echo-op/CMakeLists.txt b/example/echo-op/CMakeLists.txt
index 18f8756b..75e20fd7 100644
--- a/example/echo-op/CMakeLists.txt
+++ b/example/echo-op/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (echo-op
     Jamfile
     echo_op.cpp
 )
+
+set_property(TARGET echo-op PROPERTY FOLDER "example")
diff --git a/example/http/client/async-ssl/CMakeLists.txt b/example/http/client/async-ssl/CMakeLists.txt
index 92675aed..9392cefa 100644
--- a/example/http/client/async-ssl/CMakeLists.txt
+++ b/example/http/client/async-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_client_async_ssl.cpp
     )
 
+    set_property(TARGET http-client-async-ssl PROPERTY FOLDER "example-http-client")
+
     target_link_libraries (http-client-async-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/client/async/CMakeLists.txt b/example/http/client/async/CMakeLists.txt
index ec0935ec..917b3c9e 100644
--- a/example/http/client/async/CMakeLists.txt
+++ b/example/http/client/async/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-client-async
     Jamfile
     http_client_async.cpp
 )
+
+set_property(TARGET http-client-async PROPERTY FOLDER "example-http-client")
diff --git a/example/http/client/coro-ssl/CMakeLists.txt b/example/http/client/coro-ssl/CMakeLists.txt
index a8ac90af..1a821af7 100644
--- a/example/http/client/coro-ssl/CMakeLists.txt
+++ b/example/http/client/coro-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_client_coro_ssl.cpp
     )
 
+    set_property(TARGET http-client-coro-ssl PROPERTY FOLDER "example-http-client")
+
     target_link_libraries (http-client-coro-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/client/coro/CMakeLists.txt b/example/http/client/coro/CMakeLists.txt
index af03491c..20863167 100644
--- a/example/http/client/coro/CMakeLists.txt
+++ b/example/http/client/coro/CMakeLists.txt
@@ -14,4 +14,6 @@ add_executable (http-client-coro
     ${BOOST_BEAST_INCLUDES}
     Jamfile
     http_client_coro.cpp
-)
+    )
+
+set_property(TARGET http-client-coro PROPERTY FOLDER "example-http-client")
diff --git a/example/http/client/crawl/CMakeLists.txt b/example/http/client/crawl/CMakeLists.txt
index 7133df27..3b22fc74 100644
--- a/example/http/client/crawl/CMakeLists.txt
+++ b/example/http/client/crawl/CMakeLists.txt
@@ -18,3 +18,5 @@ add_executable (http-crawl
     http_crawl.cpp
 )
 
+set_property(TARGET http-crawl PROPERTY FOLDER "example-http-client")
+
diff --git a/example/http/client/sync-ssl/CMakeLists.txt b/example/http/client/sync-ssl/CMakeLists.txt
index df1d9827..b287c6a8 100644
--- a/example/http/client/sync-ssl/CMakeLists.txt
+++ b/example/http/client/sync-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_client_sync_ssl.cpp
     )
 
+    set_property(TARGET http-client-sync-ssl PROPERTY FOLDER "example-http-client")
+
     target_link_libraries (http-client-sync-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/client/sync/CMakeLists.txt b/example/http/client/sync/CMakeLists.txt
index 9988affd..a137647e 100644
--- a/example/http/client/sync/CMakeLists.txt
+++ b/example/http/client/sync/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-client-sync
     Jamfile
     http_client_sync.cpp
 )
+
+set_property(TARGET http-client-sync PROPERTY FOLDER "example-http-client")
diff --git a/example/http/server/async-ssl/CMakeLists.txt b/example/http/server/async-ssl/CMakeLists.txt
index bc6f9c0b..dcaff761 100644
--- a/example/http/server/async-ssl/CMakeLists.txt
+++ b/example/http/server/async-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_server_async_ssl.cpp
     )
 
+    set_property(TARGET http-server-async-ssl PROPERTY FOLDER "example-http-server")
+
     target_link_libraries (http-server-async-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/server/async/CMakeLists.txt b/example/http/server/async/CMakeLists.txt
index 2f7aeff8..95098ff9 100644
--- a/example/http/server/async/CMakeLists.txt
+++ b/example/http/server/async/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-server-async
     Jamfile
     http_server_async.cpp
 )
+
+set_property(TARGET http-server-async PROPERTY FOLDER "example-http-server")
diff --git a/example/http/server/coro-ssl/CMakeLists.txt b/example/http/server/coro-ssl/CMakeLists.txt
index dc80a112..c5da6e34 100644
--- a/example/http/server/coro-ssl/CMakeLists.txt
+++ b/example/http/server/coro-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_server_coro_ssl.cpp
     )
 
+    set_property(TARGET http-server-coro-ssl PROPERTY FOLDER "example-http-server")
+
     target_link_libraries (http-server-coro-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/server/coro/CMakeLists.txt b/example/http/server/coro/CMakeLists.txt
index 5b5ba238..6b4cf735 100644
--- a/example/http/server/coro/CMakeLists.txt
+++ b/example/http/server/coro/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-server-coro
     Jamfile
     http_server_coro.cpp
 )
+
+set_property(TARGET http-server-coro PROPERTY FOLDER "example-http-server")
diff --git a/example/http/server/fast/CMakeLists.txt b/example/http/server/fast/CMakeLists.txt
index 8e205332..cb8581ab 100644
--- a/example/http/server/fast/CMakeLists.txt
+++ b/example/http/server/fast/CMakeLists.txt
@@ -18,3 +18,5 @@ add_executable (http-server-fast
     fields_alloc.hpp
     http_server_fast.cpp
 )
+
+set_property(TARGET http-server-fast PROPERTY FOLDER "example-http-server")
diff --git a/example/http/server/flex/CMakeLists.txt b/example/http/server/flex/CMakeLists.txt
index cc6e0cb6..54cc8dc8 100644
--- a/example/http/server/flex/CMakeLists.txt
+++ b/example/http/server/flex/CMakeLists.txt
@@ -20,6 +20,8 @@ if (OPENSSL_FOUND)
         http_server_flex.cpp
     )
 
+    set_property(TARGET http-server-flex PROPERTY FOLDER "example-http-server")
+
     target_link_libraries (http-server-flex
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/server/small/CMakeLists.txt b/example/http/server/small/CMakeLists.txt
index cecc9622..4e4ced1b 100644
--- a/example/http/server/small/CMakeLists.txt
+++ b/example/http/server/small/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-server-small
     Jamfile
     http_server_small.cpp
 )
+
+set_property(TARGET http-server-small PROPERTY FOLDER "example-http-server")
diff --git a/example/http/server/stackless-ssl/CMakeLists.txt b/example/http/server/stackless-ssl/CMakeLists.txt
index e374e85e..0df45a3c 100644
--- a/example/http/server/stackless-ssl/CMakeLists.txt
+++ b/example/http/server/stackless-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         http_server_stackless_ssl.cpp
     )
 
+    set_property(TARGET http-server-stackless-ssl PROPERTY FOLDER "example-http-server")
+
     target_link_libraries (http-server-stackless-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/server/stackless/CMakeLists.txt b/example/http/server/stackless/CMakeLists.txt
index b34d5983..44fe6e70 100644
--- a/example/http/server/stackless/CMakeLists.txt
+++ b/example/http/server/stackless/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-server-stackless
     Jamfile
     http_server_stackless.cpp
 )
+
+set_property(TARGET http-server-stackless PROPERTY FOLDER "example-http-server")
diff --git a/example/http/server/sync-ssl/CMakeLists.txt b/example/http/server/sync-ssl/CMakeLists.txt
index 5747923e..2848b1ca 100644
--- a/example/http/server/sync-ssl/CMakeLists.txt
+++ b/example/http/server/sync-ssl/CMakeLists.txt
@@ -18,6 +18,9 @@ if (OPENSSL_FOUND)
         Jamfile
         http_server_sync_ssl.cpp
     )
+
+    set_property(TARGET http-server-sync-ssl PROPERTY FOLDER "example-http-server")
+    
     target_link_libraries (http-server-sync-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/http/server/sync/CMakeLists.txt b/example/http/server/sync/CMakeLists.txt
index ab130761..998f6c8e 100644
--- a/example/http/server/sync/CMakeLists.txt
+++ b/example/http/server/sync/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (http-server-sync
     Jamfile
     http_server_sync.cpp
 )
+
+set_property(TARGET http-server-sync PROPERTY FOLDER "example-http-server")
diff --git a/example/websocket/client/async-ssl/CMakeLists.txt b/example/websocket/client/async-ssl/CMakeLists.txt
index 4b522855..8572fe0c 100644
--- a/example/websocket/client/async-ssl/CMakeLists.txt
+++ b/example/websocket/client/async-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_client_async_ssl.cpp
     )
 
+    set_property(TARGET websocket-client-async-ssl PROPERTY FOLDER "example-websocket-client")
+
     target_link_libraries (websocket-client-async-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/client/async/CMakeLists.txt b/example/websocket/client/async/CMakeLists.txt
index 7f4b4b39..5017a587 100644
--- a/example/websocket/client/async/CMakeLists.txt
+++ b/example/websocket/client/async/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-client-async
     Jamfile
     websocket_client_async.cpp
 )
+
+set_property(TARGET websocket-client-async PROPERTY FOLDER "example-websocket-client")
diff --git a/example/websocket/client/coro-ssl/CMakeLists.txt b/example/websocket/client/coro-ssl/CMakeLists.txt
index 13b093cb..beccf868 100644
--- a/example/websocket/client/coro-ssl/CMakeLists.txt
+++ b/example/websocket/client/coro-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_client_coro_ssl.cpp
     )
 
+    set_property(TARGET websocket-client-coro-ssl PROPERTY FOLDER "example-websocket-client")
+
     target_link_libraries (websocket-client-coro-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/client/coro/CMakeLists.txt b/example/websocket/client/coro/CMakeLists.txt
index a04c7e16..e9de3436 100644
--- a/example/websocket/client/coro/CMakeLists.txt
+++ b/example/websocket/client/coro/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-client-coro
     Jamfile
     websocket_client_coro.cpp
 )
+
+set_property(TARGET websocket-client-coro PROPERTY FOLDER "example-websocket-client")
diff --git a/example/websocket/client/sync-ssl/CMakeLists.txt b/example/websocket/client/sync-ssl/CMakeLists.txt
index 5a5f368e..cc86b8a5 100644
--- a/example/websocket/client/sync-ssl/CMakeLists.txt
+++ b/example/websocket/client/sync-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_client_sync_ssl.cpp
     )
 
+    set_property(TARGET websocket-client-sync-ssl PROPERTY FOLDER "example-websocket-client")
+
     target_link_libraries (websocket-client-sync-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/client/sync/CMakeLists.txt b/example/websocket/client/sync/CMakeLists.txt
index a449f6fb..a298b0f5 100644
--- a/example/websocket/client/sync/CMakeLists.txt
+++ b/example/websocket/client/sync/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-client-sync
     Jamfile
     websocket_client_sync.cpp
 )
+
+set_property(TARGET websocket-client-sync PROPERTY FOLDER "example-websocket-client")
diff --git a/example/websocket/server/async-ssl/CMakeLists.txt b/example/websocket/server/async-ssl/CMakeLists.txt
index f8fed86e..4d16f7c5 100644
--- a/example/websocket/server/async-ssl/CMakeLists.txt
+++ b/example/websocket/server/async-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_server_async_ssl.cpp
     )
 
+    set_property(TARGET websocket-server-async-ssl PROPERTY FOLDER "example-websocket-server")
+
     target_link_libraries (websocket-server-async-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/server/async/CMakeLists.txt b/example/websocket/server/async/CMakeLists.txt
index 36f4ea87..9d9be2d1 100644
--- a/example/websocket/server/async/CMakeLists.txt
+++ b/example/websocket/server/async/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-server-async
     Jamfile
     websocket_server_async.cpp
 )
+
+set_property(TARGET websocket-server-async PROPERTY FOLDER "example-websocket-server")
diff --git a/example/websocket/server/coro-ssl/CMakeLists.txt b/example/websocket/server/coro-ssl/CMakeLists.txt
index b6eb14b9..3cda9b9b 100644
--- a/example/websocket/server/coro-ssl/CMakeLists.txt
+++ b/example/websocket/server/coro-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_server_coro_ssl.cpp
     )
 
+    set_property(TARGET websocket-server-coro-ssl PROPERTY FOLDER "example-websocket-server")
+
     target_link_libraries (websocket-server-coro-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/server/coro/CMakeLists.txt b/example/websocket/server/coro/CMakeLists.txt
index 58638fe2..0e4fe351 100644
--- a/example/websocket/server/coro/CMakeLists.txt
+++ b/example/websocket/server/coro/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-server-coro
     Jamfile
     websocket_server_coro.cpp
 )
+
+set_property(TARGET websocket-server-coro PROPERTY FOLDER "example-websocket-server")
diff --git a/example/websocket/server/fast/CMakeLists.txt b/example/websocket/server/fast/CMakeLists.txt
index d7308592..ebb3b21a 100644
--- a/example/websocket/server/fast/CMakeLists.txt
+++ b/example/websocket/server/fast/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-server-fast
     Jamfile
     websocket_server_fast.cpp
 )
+
+set_property(TARGET websocket-server-fast PROPERTY FOLDER "example-websocket-server")
diff --git a/example/websocket/server/stackless-ssl/CMakeLists.txt b/example/websocket/server/stackless-ssl/CMakeLists.txt
index 9c717d62..a05ddb56 100644
--- a/example/websocket/server/stackless-ssl/CMakeLists.txt
+++ b/example/websocket/server/stackless-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_server_stackless_ssl.cpp
     )
 
+    set_property(TARGET websocket-server-stackless-ssl PROPERTY FOLDER "example-websocket-server")
+
     target_link_libraries (websocket-server-stackless-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/server/stackless/CMakeLists.txt b/example/websocket/server/stackless/CMakeLists.txt
index 7fe08f54..e708309b 100644
--- a/example/websocket/server/stackless/CMakeLists.txt
+++ b/example/websocket/server/stackless/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-server-stackless
     Jamfile
     websocket_server_stackless.cpp
 )
+
+set_property(TARGET websocket-server-stackless PROPERTY FOLDER "example-websocket-server")
diff --git a/example/websocket/server/sync-ssl/CMakeLists.txt b/example/websocket/server/sync-ssl/CMakeLists.txt
index 35157acb..e5a2ebed 100644
--- a/example/websocket/server/sync-ssl/CMakeLists.txt
+++ b/example/websocket/server/sync-ssl/CMakeLists.txt
@@ -19,6 +19,8 @@ if (OPENSSL_FOUND)
         websocket_server_sync_ssl.cpp
     )
 
+    set_property(TARGET websocket-server-sync-ssl PROPERTY FOLDER "example-websocket-server")
+
     target_link_libraries (websocket-server-sync-ssl
         ${OPENSSL_LIBRARIES}
         )
diff --git a/example/websocket/server/sync/CMakeLists.txt b/example/websocket/server/sync/CMakeLists.txt
index df2dff1d..f492f90b 100644
--- a/example/websocket/server/sync/CMakeLists.txt
+++ b/example/websocket/server/sync/CMakeLists.txt
@@ -15,3 +15,5 @@ add_executable (websocket-server-sync
     Jamfile
     websocket_server_sync.cpp
 )
+
+set_property(TARGET websocket-server-sync PROPERTY FOLDER "example-websocket-server")
diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt
index dbba4892..430fa498 100644
--- a/test/beast/CMakeLists.txt
+++ b/test/beast/CMakeLists.txt
@@ -28,3 +28,5 @@ add_subdirectory (core)
 add_subdirectory (http)
 add_subdirectory (websocket)
 add_subdirectory (zlib)
+
+set_property(TARGET tests-beast PROPERTY FOLDER "tests")
diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt
index 58ca5e31..7db74482 100644
--- a/test/beast/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@@ -50,3 +50,5 @@ add_executable (tests-beast-core
     detail/variant.cpp
     detail/varint.cpp
 )
+
+set_property(TARGET tests-beast-core PROPERTY FOLDER "tests")
diff --git a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
index ce678128..c9e07fe7 100644
--- a/test/beast/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@@ -43,3 +43,5 @@ add_executable (tests-beast-http
     verb.cpp
     write.cpp
 )
+
+set_property(TARGET tests-beast-http PROPERTY FOLDER "tests")
diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
index 117e59ec..04cc3990 100644
--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -34,3 +34,5 @@ add_executable (tests-beast-websocket
     utf8_checker.cpp
     write.cpp
 )
+
+set_property(TARGET tests-beast-websocket PROPERTY FOLDER "tests")
diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt
index 504f8e0c..5c2eb99e 100644
--- a/test/beast/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@@ -28,3 +28,5 @@ add_executable (tests-beast-zlib
     inflate_stream.cpp
     zlib.cpp
 )
+
+set_property(TARGET tests-beast-zlib PROPERTY FOLDER "tests")
diff --git a/test/bench/buffers/CMakeLists.txt b/test/bench/buffers/CMakeLists.txt
index 9089f765..d8a398fc 100644
--- a/test/bench/buffers/CMakeLists.txt
+++ b/test/bench/buffers/CMakeLists.txt
@@ -19,3 +19,5 @@ add_executable (bench-buffers
     Jamfile
     bench_buffers.cpp
 )
+
+set_property(TARGET bench-buffers PROPERTY FOLDER "tests-bench")
diff --git a/test/bench/parser/CMakeLists.txt b/test/bench/parser/CMakeLists.txt
index 6c0a9784..e83a7ddf 100644
--- a/test/bench/parser/CMakeLists.txt
+++ b/test/bench/parser/CMakeLists.txt
@@ -23,3 +23,5 @@ add_executable (bench-parser
     nodejs_parser.cpp
     bench_parser.cpp
 )
+
+set_property(TARGET bench-parser PROPERTY FOLDER "tests-bench")
diff --git a/test/bench/utf8_checker/CMakeLists.txt b/test/bench/utf8_checker/CMakeLists.txt
index 3e256a65..4a9d0e72 100644
--- a/test/bench/utf8_checker/CMakeLists.txt
+++ b/test/bench/utf8_checker/CMakeLists.txt
@@ -19,3 +19,5 @@ add_executable (bench-utf8-checker
     Jamfile
     bench_utf8_checker.cpp
 )
+
+set_property(TARGET bench-utf8-checker PROPERTY FOLDER "tests-bench")
diff --git a/test/bench/wsload/CMakeLists.txt b/test/bench/wsload/CMakeLists.txt
index 00705a97..22813bf3 100644
--- a/test/bench/wsload/CMakeLists.txt
+++ b/test/bench/wsload/CMakeLists.txt
@@ -20,3 +20,5 @@ add_executable (bench-wsload
     Jamfile
     wsload.cpp
     )
+
+set_property(TARGET bench-wsload PROPERTY FOLDER "tests-bench")
diff --git a/test/bench/zlib/CMakeLists.txt b/test/bench/zlib/CMakeLists.txt
index d02c9ead..e0c9e1ee 100644
--- a/test/bench/zlib/CMakeLists.txt
+++ b/test/bench/zlib/CMakeLists.txt
@@ -26,3 +26,5 @@ add_executable (bench-zlib
     deflate_stream.cpp
     inflate_stream.cpp
 )
+
+set_property(TARGET bench-zlib PROPERTY FOLDER "tests-bench")
diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt
index f2c20ef5..9eba1208 100644
--- a/test/doc/CMakeLists.txt
+++ b/test/doc/CMakeLists.txt
@@ -26,3 +26,5 @@ add_executable (tests-doc
     websocket_snippets.cpp
     exemplars.cpp
 )
+
+set_property(TARGET tests-doc PROPERTY FOLDER "tests")
diff --git a/test/example/common/CMakeLists.txt b/test/example/common/CMakeLists.txt
index dff2123e..66b45ea9 100644
--- a/test/example/common/CMakeLists.txt
+++ b/test/example/common/CMakeLists.txt
@@ -24,3 +24,5 @@ add_executable (tests-example-common
     ssl_stream.cpp
     main.cpp
 )
+
+set_property(TARGET tests-example-common PROPERTY FOLDER "tests")
\ No newline at end of file