qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject [qpid-dispatch] branch master updated: DISPATCH-1513: Made changes CMake v 2.8 compatible. This closes #665
Date Tue, 21 Jan 2020 22:02:17 GMT
This is an automated email from the ASF dual-hosted git repository.

gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ebdff0  DISPATCH-1513: Made changes CMake v 2.8 compatible. This closes #665
6ebdff0 is described below

commit 6ebdff0c9d997a3c3769df954dfbf57146c4835d
Author: Ganesh Murthy <gmurthy@apache.org>
AuthorDate: Thu Jan 16 17:34:47 2020 -0500

    DISPATCH-1513: Made changes CMake v 2.8 compatible. This closes #665
---
 cmake/FindLibWebSockets.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/FindLibWebSockets.cmake b/cmake/FindLibWebSockets.cmake
index ddb8502..124d5f3 100644
--- a/cmake/FindLibWebSockets.cmake
+++ b/cmake/FindLibWebSockets.cmake
@@ -61,16 +61,16 @@ else()
 endif()
 
 
-if (LIBWEBSOCKETS_FOUND)
+if (LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
   # This is a fix for DISPATCH-1513. libwebsockets versions 3.2.0 introduces a new flag called
LWS_SERVER_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER
   # The new flag allows (as the flag says) HTTP pver HTTPS listeners. Since this flag is
not available before lws 3.2.0 we need
   # to selectively comment out a test.
   set(TEST_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER "#")
   set(LWS_VERSION_WITH_SSL_FIX "3.2.0")
-  if (LIBWEBSOCKETS_VERSION_STRING AND (LIBWEBSOCKETS_VERSION_STRING VERSION_GREATER_EQUAL
LWS_VERSION_WITH_SSL_FIX))
+  if ((LIBWEBSOCKETS_VERSION_STRING STREQUAL LWS_VERSION_WITH_SSL_FIX) OR (LIBWEBSOCKETS_VERSION_STRING
STRGREATER  LWS_VERSION_WITH_SSL_FIX))
     set(TEST_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER "")
   endif()
-endif(LIBWEBSOCKETS_FOUND)
+endif(LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
 
 if(NOT LIBWEBSOCKETS_FOUND)
   unset(LIBWEBSOCKETS_LIBRARIES)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message