non-openssl: only check for openssl ecdh in openssl builds
authorKarl Palsson <karlp@etactica.com>
Mon, 6 Jun 2016 15:03:09 +0000 (15:03 +0000)
committerAndy Green <andy@warmcat.com>
Tue, 7 Jun 2016 11:50:26 +0000 (19:50 +0800)
See also
https://github.com/warmcat/libwebsockets/issues/559

Signed-off-by: Karl Palsson <karlp@etactica.com>
CMakeLists.txt

index da62dfd..ad694cb 100644 (file)
@@ -826,7 +826,6 @@ if (LWS_WITH_SSL)
 
                include_directories("${OPENSSL_INCLUDE_DIRS}")
                list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
-       endif()
 
        # older (0.98) Openssl lacks this
        set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
@@ -835,6 +834,7 @@ if (LWS_WITH_SSL)
        if (LWS_SSL_SERVER_WITH_ECDH_CERT AND NOT LWS_HAVE_OPENSSL_ECDH_H)
                message(FATAL_ERROR "Missing openssl/ecdh.h, so cannot use LWS_SSL_SERVER_WITH_ECDH_CERT")
        endif()
+       endif()
 
 endif(LWS_WITH_SSL)