qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: NO-JIRA: Default Windows to using schannel SSL even if OpenSSL is present
Date Mon, 18 Jan 2016 19:55:41 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 06ed3abc1 -> f573980ef


NO-JIRA: Default Windows to using schannel SSL even if OpenSSL is present


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f573980e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f573980e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f573980e

Branch: refs/heads/master
Commit: f573980efeb1d2cd4502a603efc0f27443009b56
Parents: 06ed3ab
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Mon Jan 18 14:27:31 2016 -0500
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Mon Jan 18 14:42:47 2016 -0500

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f573980e/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 96859ab..563c8ab 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -61,16 +61,16 @@ mark_as_advanced(CYRUS_SASL_LIBRARY CYRUS_SASL_INCLUDE_DIR)
 find_program(SASLPASSWD_EXE saslpasswd2 DOC "Program used to make SASL user db for testing")
 mark_as_advanced(SASLPASSWD_EXE)
 
+set(ssl_impl, none)
 if(PN_WINAPI)
   set(ssl_impl schannel)
   set(ssl_providers "'none','schannel','openssl'")
 else(PN_WINAPI)
-  set(ssl_impl, none)
+  if (OPENSSL_FOUND)
+    set(ssl_impl openssl)
+  endif (OPENSSL_FOUND)
   set(ssl_providers "'none','openssl'")
 endif(PN_WINAPI)
-if (OPENSSL_FOUND)
-  set(ssl_impl openssl)
-endif (OPENSSL_FOUND)
 set(SSL_IMPL ${ssl_impl} CACHE STRING "Library to use for SSL/TLS support. Valid values:
${ssl_providers}")
 
 set(sasl_providers cyrus none)


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


Mime
View raw message