Skip to content
Snippets Groups Projects
Commit cb4156d4 authored by Joakim Söderberg's avatar Joakim Söderberg Committed by Andy Green
Browse files

Cleaned up the CyaSSL linking in the CMake project a bit.

Separated the CyaSSL linking and OpenSSL linking for more clearity.
Now tested on both OSX and Windows as well.
parent 91de9339
No related branches found
No related tags found
No related merge requests found
...@@ -327,20 +327,22 @@ if (WITH_SSL) ...@@ -327,20 +327,22 @@ if (WITH_SSL)
if (USE_CYASSL) if (USE_CYASSL)
# Use CyaSSL as OpenSSL replacement. # Use CyaSSL as OpenSSL replacement.
set(OPENSSL_LIBRARIES ${CYASSL_LIB}) # TODO: Add a find_package command for this also.
set(OPENSSL_INCLUDE_DIR ${CYASSL_INCLUDE_DIRS}) message("CyaSSL include dir: ${CYASSL_INCLUDE_DIRS}")
set(OPENSSL_FOUND 1) message("CyaSSL libraries: ${CYASSL_LIB}")
include_directories(${CYASSL_INCLUDE_DIRS})
target_link_libraries(websockets ${CYASSL_LIB})
else() else()
# TODO: Add support for STATIC also. # TODO: Add support for STATIC also.
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
# TODO: Find OpenSSL binaries and copy them to the output directories for the test-apps so that they can be run out of the box. message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
endif() message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") include_directories(${OPENSSL_INCLUDE_DIR})
message("OpenSSL libraries: ${OPENSSL_LIBRARIES}") target_link_libraries(websockets ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR}) endif()
target_link_libraries(websockets ${OPENSSL_LIBRARIES})
endif(WITH_SSL) endif(WITH_SSL)
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment