From f6bcb86a6cdeac3246466f438e6697643ffd4f01 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 10 Jul 2013 16:09:38 -0500 Subject: [PATCH 1/2] Implement conditional cmake configuration for echo_server_tls --- CMakeLists.txt | 3 ++- cmake/CMakeHelpers.cmake | 4 ++++ examples/echo_server_tls/CMakeLists.txt | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 examples/echo_server_tls/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 878c7eaedc..53ff4e4ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,8 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) else () message (FATAL_ERROR "Failed to find required dependency: boost") endif () - + + find_package(OpenSSL) endif() ############ Add projects diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake index 411829cbcd..0a23905e89 100644 --- a/cmake/CMakeHelpers.cmake +++ b/cmake/CMakeHelpers.cmake @@ -72,3 +72,7 @@ endmacro () macro (link_boost) target_link_libraries (${TARGET_NAME} ${Boost_LIBRARIES}) endmacro () + +macro (link_openssl) + target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) +endmacro () diff --git a/examples/echo_server_tls/CMakeLists.txt b/examples/echo_server_tls/CMakeLists.txt new file mode 100644 index 0000000000..619ac41ff9 --- /dev/null +++ b/examples/echo_server_tls/CMakeLists.txt @@ -0,0 +1,15 @@ + +file (GLOB SOURCE_FILES *.cpp) +file (GLOB HEADER_FILES *.hpp) + + +if (OPENSSL_FOUND) + +init_target (echo_server_tls) + +build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES}) + +link_boost () +link_openssl() +final_target () +endif() \ No newline at end of file From b83b054c7e7546a283704041f2d9bf25ec2ded99 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Thu, 11 Jul 2013 10:54:43 -0500 Subject: [PATCH 2/2] add CMake config for print_server and telemetry_client --- examples/echo_server/echo_server.cpp | 2 +- examples/print_server/CMakeLists.txt | 10 ++++++++++ examples/telemetry_client/CMakeLists.txt | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 examples/print_server/CMakeLists.txt create mode 100644 examples/telemetry_client/CMakeLists.txt diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp index db86234214..a4068f30e2 100644 --- a/examples/echo_server/echo_server.cpp +++ b/examples/echo_server/echo_server.cpp @@ -34,7 +34,7 @@ int main() { try { // Set logging settings echo_server.set_access_channels(websocketpp::log::alevel::all); - echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload); + // echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload); // Initialize ASIO echo_server.init_asio(); diff --git a/examples/print_server/CMakeLists.txt b/examples/print_server/CMakeLists.txt new file mode 100644 index 0000000000..2204c30517 --- /dev/null +++ b/examples/print_server/CMakeLists.txt @@ -0,0 +1,10 @@ + +file (GLOB SOURCE_FILES *.cpp) +file (GLOB HEADER_FILES *.hpp) + +init_target (print_server) + +build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES}) + +link_boost () +final_target () diff --git a/examples/telemetry_client/CMakeLists.txt b/examples/telemetry_client/CMakeLists.txt new file mode 100644 index 0000000000..6172714566 --- /dev/null +++ b/examples/telemetry_client/CMakeLists.txt @@ -0,0 +1,10 @@ + +file (GLOB SOURCE_FILES *.cpp) +file (GLOB HEADER_FILES *.hpp) + +init_target (telemetry_client) + +build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES}) + +link_boost () +final_target ()