Tidy up CMakeLists

CMakeLists.txt

@@ -70,6 +70,9 @@ include_directories (include)
 file(GLOB_RECURSE BEAST_INCLUDES
     ${PROJECT_SOURCE_DIR}/include/beast/*.hpp
     ${PROJECT_SOURCE_DIR}/include/beast/*.ipp
+)
+
+file(GLOB_RECURSE EXTRAS_INCLUDES
     ${PROJECT_SOURCE_DIR}/extras/beast/*.hpp
     ${PROJECT_SOURCE_DIR}/extras/beast/*.ipp
 )
@@ -79,5 +82,3 @@ add_subdirectory (test)
 add_subdirectory (test/core)
 add_subdirectory (test/http)
 add_subdirectory (test/websocket)
-
-#enable_testing()

examples/CMakeLists.txt

@@ -1,12 +1,13 @@
 # Part of Beast
 
-GroupSources(extras/beast beast)
+GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 
 GroupSources(examples "/")
 
 add_executable (http-crawl
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     urls_large_data.hpp
     urls_large_data.cpp
     http_crawl.cpp
@@ -18,6 +19,7 @@ endif()
 
 add_executable (http-server
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     file_body.hpp
     mime_type.hpp
     http_async_server.hpp
@@ -31,6 +33,7 @@ endif()
 
 add_executable (http-example
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     http_example.cpp
 )
 
@@ -40,6 +43,7 @@ endif()
 
 add_executable (websocket-example
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     websocket_example.cpp
 )
 

test/CMakeLists.txt

@@ -1,11 +1,12 @@
 # Part of Beast
 
-GroupSources(extras/beast beast)
+GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 GroupSources(test "/")
 
 add_executable (lib-tests
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     ../extras/beast/unit_test/main.cpp
     core.cpp
     http.cpp

test/Jamfile

@@ -33,10 +33,10 @@ unit-test core-tests :
     core/streambuf.cpp
     core/to_string.cpp
     core/write_dynabuf.cpp
-    core/detail/base64.cpp
-    core/detail/empty_base_optimization.cpp
-    core/detail/get_lowest_layer.cpp
-    core/detail/sha1.cpp
+    core/base64.cpp
+    core/empty_base_optimization.cpp
+    core/get_lowest_layer.cpp
+    core/sha1.cpp
     ;
 
 unit-test http-tests :
@@ -59,7 +59,7 @@ unit-test http-tests :
     http/streambuf_body.cpp
     http/string_body.cpp
     http/write.cpp
-    http/detail/chunk_encode.cpp
+    http/chunk_encode.cpp
     ;
 
 unit-test bench-tests :
@@ -75,10 +75,10 @@ unit-test websocket-tests :
     websocket/rfc6455.cpp
     websocket/stream.cpp
     websocket/teardown.cpp
-    websocket/detail/frame.cpp
-    websocket/detail/mask.cpp
-    websocket/detail/stream_base.cpp
-    websocket/detail/utf8_checker.cpp
+    websocket/frame.cpp
+    websocket/mask.cpp
+    websocket/stream_base.cpp
+    websocket/utf8_checker.cpp
     ;
 
 exe websocket-echo :

test/core/CMakeLists.txt

@@ -1,11 +1,12 @@
 # Part of Beast
 
-GroupSources(extras/beast beast)
+GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 GroupSources(test/core "/")
 
 add_executable (core-tests
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     ../../extras/beast/unit_test/main.cpp
     buffer_test.hpp
     async_completion.cpp
@@ -27,10 +28,10 @@ add_executable (core-tests
     streambuf.cpp
     to_string.cpp
     write_dynabuf.cpp
-    detail/base64.cpp
-    detail/empty_base_optimization.cpp
-    detail/get_lowest_layer.cpp
-    detail/sha1.cpp
+    base64.cpp
+    empty_base_optimization.cpp
+    get_lowest_layer.cpp
+    sha1.cpp
 )
 
 if (NOT WIN32)

test/http/CMakeLists.txt

@@ -1,11 +1,12 @@
 # Part of Beast
 
-GroupSources(extras/beast beast)
+GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 GroupSources(test/http "/")
 
 add_executable (http-tests
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     message_fuzz.hpp
     fail_parser.hpp
     ../../extras/beast/unit_test/main.cpp
@@ -27,7 +28,7 @@ add_executable (http-tests
     streambuf_body.cpp
     string_body.cpp
     write.cpp
-    detail/chunk_encode.cpp
+    chunk_encode.cpp
 )
 
 if (NOT WIN32)
@@ -36,6 +37,7 @@ endif()
 
 add_executable (bench-tests
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     nodejs_parser.hpp
     ../../extras/beast/unit_test/main.cpp
     nodejs_parser.cpp

test/websocket/CMakeLists.txt

@@ -1,11 +1,12 @@
 # Part of Beast
 
-GroupSources(extras/beast beast)
+GroupSources(extras/beast extras)
 GroupSources(include/beast beast)
 GroupSources(test/websocket "/")
 
 add_executable (websocket-tests
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     ../../extras/beast/unit_test/main.cpp
     websocket_async_echo_server.hpp
     websocket_sync_echo_server.hpp
@@ -14,10 +15,10 @@ add_executable (websocket-tests
     rfc6455.cpp
     stream.cpp
     teardown.cpp
-    detail/frame.cpp
-    detail/mask.cpp
-    detail/stream_base.cpp
-    detail/utf8_checker.cpp
+    frame.cpp
+    mask.cpp
+    stream_base.cpp
+    utf8_checker.cpp
 )
 
 if (NOT WIN32)
@@ -26,6 +27,7 @@ endif()
 
 add_executable (websocket-echo
     ${BEAST_INCLUDES}
+    ${EXTRAS_INCLUDES}
     websocket_async_echo_server.hpp
     websocket_sync_echo_server.hpp
     websocket_echo.cpp