Rename Cmake variables for clarity

This commit is contained in:
Vinnie Falco
2017-10-30 08:57:31 -07:00
parent 42679ee0bc
commit e39e4c73bf
50 changed files with 65 additions and 69 deletions

View File

@ -1,6 +1,7 @@
Version 132:
* Tidy up project folders in CMakeLists.txt
* Rename Cmake variables for clarity
--------------------------------------------------------------------------------

View File

@ -173,19 +173,15 @@ if (OPENSSL_FOUND)
include_directories (${OPENSSL_INCLUDE_DIR})
endif()
file (GLOB_RECURSE BOOST_BEAST_INCLUDES
file (GLOB_RECURSE BOOST_BEAST_FILES
${PROJECT_SOURCE_DIR}/include/boost/beast/*.hpp
${PROJECT_SOURCE_DIR}/include/boost/beast/*.ipp
)
file (GLOB_RECURSE COMMON_INCLUDES
file (GLOB_RECURSE COMMON_FILES
${PROJECT_SOURCE_DIR}/example/common/*.hpp
)
file (GLOB_RECURSE EXAMPLE_INCLUDES
${PROJECT_SOURCE_DIR}/example/*.hpp
)
if (Beast_BUILD_EXAMPLES AND
(NOT "${VARIANT}" STREQUAL "coverage") AND
(NOT "${VARIANT}" STREQUAL "ubasan"))

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/advanced/server-flex "/")
add_executable (advanced-server-flex
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/detect_ssl.hpp
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
${PROJECT_SOURCE_DIR}/example/common/ssl_stream.hpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/advanced/server "/")
add_executable (advanced-server
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
advanced_server.cpp
)

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/echo-op "/")
add_executable (echo-op
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
echo_op.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/client/async-ssl "/")
add_executable (http-client-async-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
http_client_async_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/client/async "/")
add_executable (http-client-async
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_client_async.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/client/coro-ssl "/")
add_executable (http-client-coro-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
http_client_coro_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/client/coro "/")
add_executable (http-client-coro
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_client_coro.cpp
)

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/client/crawl "/")
add_executable (http-crawl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
urls_large_data.hpp
urls_large_data.cpp

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/client/sync-ssl "/")
add_executable (http-client-sync-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
http_client_sync_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/client/sync "/")
add_executable (http-client-sync
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_client_sync.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/server/async-ssl "/")
add_executable (http-server-async-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
http_server_async_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/server/async "/")
add_executable (http-server-async
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_server_async.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/server/coro-ssl "/")
add_executable (http-server-coro-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
http_server_coro_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/server/coro "/")
add_executable (http-server-coro
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_server_coro.cpp
)

View File

@ -12,8 +12,8 @@ GroupSources(example/common common)
GroupSources(example/http/server/fast "/")
add_executable (http-server-fast
${BOOST_BEAST_INCLUDES}
${COMMON_INCLUDES}
${BOOST_BEAST_FILES}
${COMMON_FILES}
Jamfile
fields_alloc.hpp
http_server_fast.cpp

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/server/flex "/")
add_executable (http-server-flex
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/detect_ssl.hpp
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/server/small "/")
add_executable (http-server-small
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_server_small.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/server/stackless-ssl "/")
add_executable (http-server-stackless-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
http_server_stackless_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/server/stackless "/")
add_executable (http-server-stackless
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_server_stackless.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/http/server/sync-ssl "/")
add_executable (http-server-sync-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
http_server_sync_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/http/server/sync "/")
add_executable (http-server-sync
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
http_server_sync.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/client/async-ssl "/")
add_executable (websocket-client-async-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
websocket_client_async_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/client/async "/")
add_executable (websocket-client-async
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_client_async.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/client/coro-ssl "/")
add_executable (websocket-client-coro-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
websocket_client_coro_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/client/coro "/")
add_executable (websocket-client-coro
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_client_coro.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/client/sync-ssl "/")
add_executable (websocket-client-sync-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
Jamfile
websocket_client_sync_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/client/sync "/")
add_executable (websocket-client-sync
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_client_sync.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/server/async-ssl "/")
add_executable (websocket-server-async-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
websocket_server_async_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/server/async "/")
add_executable (websocket-server-async
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_server_async.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/server/coro-ssl "/")
add_executable (websocket-server-coro-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
websocket_server_coro_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/server/coro "/")
add_executable (websocket-server-coro
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_server_coro.cpp
)

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/server/fast "/")
add_executable (websocket-server-fast
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_server_fast.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/server/stackless-ssl "/")
add_executable (websocket-server-stackless-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
websocket_server_stackless_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/server/stackless "/")
add_executable (websocket-server-stackless
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_server_stackless.cpp
)

View File

@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
GroupSources(example/websocket/server/sync-ssl "/")
add_executable (websocket-server-sync-ssl
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
Jamfile
websocket_server_sync_ssl.cpp

View File

@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
GroupSources(example/websocket/server/sync "/")
add_executable (websocket-server-sync
${BOOST_BEAST_INCLUDES}
${BOOST_BEAST_FILES}
Jamfile
websocket_server_sync.cpp
)

View File

@ -13,8 +13,8 @@ GroupSources(subtree/unit_test/include/boost/beast extras)
GroupSources(test/beast "/")
add_executable (tests-beast
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
core.cpp

View File

@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/beast/core "/")
add_executable (tests-beast-core
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
buffer_test.hpp

View File

@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/beast/http "/")
add_executable (tests-beast-http
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
message_fuzz.hpp

View File

@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/beast/websocket "/")
add_executable (tests-beast-websocket
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
test.hpp

View File

@ -18,8 +18,8 @@ if (MSVC)
endif()
add_executable (tests-beast-zlib
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${ZLIB_SOURCES}
${TEST_MAIN}
Jamfile

View File

@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/bench/buffers "/")
add_executable (bench-buffers
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
bench_buffers.cpp

View File

@ -14,8 +14,8 @@ GroupSources(test/beast/http "/")
GroupSources(test/bench/parser "/")
add_executable (bench-parser
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
${PROJECT_SOURCE_DIR}/test/beast/http/message_fuzz.hpp

View File

@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/bench/utf8_checker "/")
add_executable (bench-utf8-checker
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
bench_utf8_checker.cpp

View File

@ -14,9 +14,9 @@ GroupSources(subtree/unit_test/include/boost/beast extras)
GroupSources(test/bench/wsload "/")
add_executable (bench-wsload
${BOOST_BEAST_INCLUDES}
${COMMON_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${COMMON_FILES}
${EXTRAS_FILES}
Jamfile
wsload.cpp
)

View File

@ -18,8 +18,8 @@ if (MSVC)
endif()
add_executable (bench-zlib
${BOOST_BEAST_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${ZLIB_SOURCES}
${TEST_MAIN}
Jamfile

View File

@ -14,9 +14,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/doc "/")
add_executable (tests-doc
${BOOST_BEAST_INCLUDES}
${EXAMPLE_INCLUDES}
${EXTRAS_INCLUDES}
${BOOST_BEAST_FILES}
${EXTRAS_FILES}
${TEST_MAIN}
Jamfile
core_examples.cpp

View File

@ -14,8 +14,8 @@ GroupSources(include/boost/beast beast)
GroupSources(test/example/common "/")
add_executable (tests-example-common
${BOOST_BEAST_INCLUDES}
${COMMON_INCLUDES}
${BOOST_BEAST_FILES}
${COMMON_FILES}
Jamfile
detect_ssl.cpp
root_certificates.cpp