Refactor CMakeLists

Closes #2471
Closes #1816

test/bench/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,8 +8,8 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-add_subdirectory (buffers)
-add_subdirectory (parser)
-add_subdirectory (utf8_checker)
-add_subdirectory (wsload)
-add_subdirectory (zlib)
+add_subdirectory(buffers)
+add_subdirectory(parser)
+add_subdirectory(utf8_checker)
+add_subdirectory(wsload)
+add_subdirectory(zlib)

test/bench/buffers/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,19 +8,12 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources (include/boost/beast beast)
-GroupSources (test/bench/buffers "/")
-
-add_executable (bench-buffers
-    ${BOOST_BEAST_FILES}
+add_executable(bench-buffers
     Jamfile
-    bench_buffers.cpp
-)
+    bench_buffers.cpp)
 
 target_link_libraries(bench-buffers
-    lib-asio
-    lib-beast
-    lib-test
-    )
+    lib-test)
 
-set_property(TARGET bench-buffers PROPERTY FOLDER "tests-bench")
+set_target_properties(bench-buffers
+    PROPERTIES FOLDER "tests-bench")

test/bench/parser/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,23 +8,17 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources (include/boost/beast beast)
-GroupSources (test/beast/http "/")
-GroupSources (test/bench/parser "/")
-
-add_executable (bench-parser
-    ${BOOST_BEAST_FILES}
+add_executable(bench-parser
     Jamfile
-    ${PROJECT_SOURCE_DIR}/test/beast/http/message_fuzz.hpp
     nodejs_parser.hpp
     nodejs_parser.cpp
-    bench_parser.cpp
-)
+    bench_parser.cpp)
+
+target_include_directories(bench-parser
+    PRIVATE ${PROJECT_SOURCE_DIR})
 
 target_link_libraries(bench-parser
-    lib-asio
-    lib-beast
-    lib-test
-    )
+    lib-test)
 
-set_property(TARGET bench-parser PROPERTY FOLDER "tests-bench")
+set_target_properties(bench-parser
+    PROPERTIES FOLDER "tests-bench")

test/bench/utf8_checker/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,19 +8,12 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources (include/boost/beast beast)
-GroupSources (test/bench/utf8_checker "/")
-
-add_executable (bench-utf8-checker
-    ${BOOST_BEAST_FILES}
+add_executable(bench-utf8-checker
     Jamfile
-    bench_utf8_checker.cpp
-)
+    bench_utf8_checker.cpp)
 
 target_link_libraries(bench-utf8-checker
-    lib-asio
-    lib-beast
-    lib-test
-    )
+    lib-test)
 
-set_property(TARGET bench-utf8-checker PROPERTY FOLDER "tests-bench")
+set_target_properties(bench-utf8-checker
+    PROPERTIES FOLDER "tests-bench")

test/bench/wsload/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,18 +8,12 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources (include/boost/beast beast)
-GroupSources (test/bench/wsload "/")
-
-add_executable (bench-wsload
-    ${BOOST_BEAST_FILES}
+add_executable(bench-wsload
     Jamfile
-    wsload.cpp
-    )
+    wsload.cpp)
 
 target_link_libraries(bench-wsload
-    lib-asio
-    lib-beast
-    )
+    lib-beast)
 
-set_property(TARGET bench-wsload PROPERTY FOLDER "tests-bench")
+set_target_properties(bench-wsload
+    PROPERTIES FOLDER "tests-bench")

test/bench/zlib/CMakeLists.txt

@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+# Copyright (c) 2024 Mohammad Nejati
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -7,25 +8,17 @@
 # Official repository: https://github.com/boostorg/beast
 #
 
-GroupSources (include/boost/beast beast)
-GroupSources (test/extern/zlib-1.2.12 zlib)
-GroupSources (test/bench/zlib "/")
-
-if (MSVC)
-    set_source_files_properties (${ZLIB_SOURCES} PROPERTIES COMPILE_FLAGS "/wd4127 /wd4131 /wd4244")
-endif()
-
 add_executable (bench-zlib
-    ${BOOST_BEAST_FILES}
-    ${ZLIB_SOURCES}
     Jamfile
     deflate_stream.cpp
-    inflate_stream.cpp
-)
-target_link_libraries(bench-zlib
-    lib-asio
-    lib-beast
-    lib-test
-    )
+    inflate_stream.cpp)
 
-set_property(TARGET bench-zlib PROPERTY FOLDER "tests-bench")
+target_include_directories(bench-zlib
+    PRIVATE ${PROJECT_SOURCE_DIR}/test/extern)
+
+target_link_libraries(bench-zlib
+    lib-test
+    lib-zlib)
+
+set_target_properties(bench-zlib
+    PROPERTIES FOLDER "tests-bench")