aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Åslund <anders.aslund@me.com>2016-10-15 20:26:12 +0200
committerAnders Åslund <anders.aslund@me.com>2016-10-15 20:26:12 +0200
commit5921ccd0ed20a6be58e358a6fc5c89a7acc099e6 (patch)
tree9d147850788841184aee73da75797688c1a5704f
parent4e39b23e455e455f1878b3e68d729a1737f3e431 (diff)
downloadcrow-5921ccd0ed20a6be58e358a6fc5c89a7acc099e6.tar.gz
crow-5921ccd0ed20a6be58e358a6fc5c89a7acc099e6.zip
Fix linking error on OSX
Fix websocket example
-rw-r--r--examples/CMakeLists.txt8
-rw-r--r--examples/websocket/example_ws.cpp4
-rw-r--r--examples/websocket/templates/ws.html2
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<crow::websocket::connection*> 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 @@
<textarea id="log" cols=100 rows=50>
</textarea>
<script>
-var sock = new WebSocket("ws://i.ipkn.me:40080/ws");
+var sock = new WebSocket("ws://localhost:40080/ws");
sock.onopen = ()=>{
console.log('open')
}