Merge pull request XRPLF#274 from hobu/master

Implement conditional cmake configuration for echo_server_tls and add cmake config for print_server and telemetry_client
rec · Jul 14, 2013 · d564189 · d564189
2 parents ddca46f + b83b054
commit d564189
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 2 deletions.
diff --git 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
@@ -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/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/echo_server_tls/CMakeLists.txt 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()
diff --git a/examples/print_server/CMakeLists.txt 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
@@ -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 ()