diff options
| author | Jaeseung Ha <ipknhama@gmail.com> | 2017-09-17 19:15:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 19:15:03 +0900 |
| commit | 6df366ce1db89fb0d473ae199c653223fc443bf9 (patch) | |
| tree | 62c34a98f5f21ace43331f34e0ef7b4fa885f578 | |
| parent | 4786dac0a8e908345e25a4c79da9175201f6b7fc (diff) | |
| parent | 4394142d3f0c061b2a1a09b00ca6a7d12da31ddd (diff) | |
| download | crow-6df366ce1db89fb0d473ae199c653223fc443bf9.tar.gz crow-6df366ce1db89fb0d473ae199c653223fc443bf9.zip | |
Merge pull request #177 from tekn0ir/fix_libssl_example
Fix linking error on OSX & fix websocket example
| -rw-r--r-- | examples/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | examples/websocket/example_ws.cpp | 8 | ||||
| -rw-r--r-- | examples/websocket/templates/ws.html | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index ef65f02..fac0abb 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -19,7 +19,13 @@ endif() add_executable(example_websocket websocket/example_ws.cpp) target_link_libraries(example_websocket ${Boost_LIBRARIES}) -target_link_libraries(example_websocket ${CMAKE_THREAD_LIBS_INIT} ssl crypto) +target_link_libraries(example_websocket ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}) +add_custom_command(OUTPUT ws.html + COMMAND ${CMAKE_COMMAND} -E + copy ${PROJECT_SOURCE_DIR}/websocket/templates/ws.html ${CMAKE_CURRENT_BINARY_DIR}/ws.html + DEPENDS ${PROJECT_SOURCE_DIR}/websocket/templates/ws.html + ) +add_custom_target(example_ws_copy ALL DEPENDS ws.html) add_executable(example example.cpp) #target_link_libraries(example crow) diff --git a/examples/websocket/example_ws.cpp b/examples/websocket/example_ws.cpp index e3c1b85..173d062 100644 --- a/examples/websocket/example_ws.cpp +++ b/examples/websocket/example_ws.cpp @@ -33,10 +33,10 @@ int main() CROW_ROUTE(app, "/") ([]{ - char name[256]; - gethostname(name, 256); - crow::mustache::context x; - x["servername"] = name; + char name[256]; + gethostname(name, 256); + crow::mustache::context x; + x["servername"] = name; auto page = crow::mustache::load("ws.html"); return page.render(x); diff --git a/examples/websocket/templates/ws.html b/examples/websocket/templates/ws.html index 5200b8b..2d38fdf 100644 --- a/examples/websocket/templates/ws.html +++ b/examples/websocket/templates/ws.html @@ -12,6 +12,7 @@ </textarea> <script> var sock = new WebSocket("ws://{{servername}}:40080/ws"); + sock.onopen = ()=>{ console.log('open') } |