diff --git a/CMakeLists.txt b/CMakeLists.txt index 40da9340..d640df41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,6 +171,10 @@ if (USE_TLS) if (APPLE) set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/local/opt/openssl/lib) set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr/local/opt/openssl/include) + + # This is for MacPort OpenSSL 1.0 + # set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib/openssl-1.0) + # set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/local/include/openssl-1.0) endif() # This OPENSSL_FOUND check is to help find a cmake manually configured OpenSSL diff --git a/test/IXWebSocketSubProtocolTest.cpp b/test/IXWebSocketSubProtocolTest.cpp index ab9cb22d..b56eb836 100644 --- a/test/IXWebSocketSubProtocolTest.cpp +++ b/test/IXWebSocketSubProtocolTest.cpp @@ -96,7 +96,7 @@ TEST_CASE("subprotocol", "[websocket_subprotocol]") int attempts = 0; while (!connected) { - REQUIRE(attempts++ < 10); + REQUIRE(attempts++ < 100); ix::msleep(10); }