From 5921ccd0ed20a6be58e358a6fc5c89a7acc099e6 Mon Sep 17 00:00:00 2001 From: Anders Åslund Date: Sat, 15 Oct 2016 20:26:12 +0200 Subject: Fix linking error on OSX Fix websocket example --- examples/CMakeLists.txt | 8 +++++++- examples/websocket/example_ws.cpp | 4 ++-- examples/websocket/templates/ws.html | 2 +- 3 files changed, 10 insertions(+), 4 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 ec3603c..0bd2022 100644 --- a/examples/websocket/example_ws.cpp +++ b/examples/websocket/example_ws.cpp @@ -6,6 +6,7 @@ int main() { crow::SimpleApp app; + crow::mustache::set_base("."); std::mutex mtx;; std::unordered_set users; @@ -33,8 +34,7 @@ int main() CROW_ROUTE(app, "/") ([]{ - auto page = crow::mustache::load("ws.html"); - return page.render(); + return crow::mustache::load("ws.html").render(); }); app.port(40080) diff --git a/examples/websocket/templates/ws.html b/examples/websocket/templates/ws.html index f6e7281..5320113 100644 --- a/examples/websocket/templates/ws.html +++ b/examples/websocket/templates/ws.html @@ -11,7 +11,7 @@