Author: astitcher
Date: Wed Oct 3 04:46:21 2012
New Revision: 1393289
URL: http://svn.apache.org/viewvc?rev=1393289&view=rev
Log:
NO-JIRA: Change cmake to use FindPackage for OpenSSL rather than doing it by
hand
- also remove unnecessary define for OpenSSL
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/pn_config.h.in
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1393289&r1=1393288&r2=1393289&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Wed Oct 3 04:46:21 2012
@@ -11,14 +11,13 @@ set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib
set (INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
-include(CheckIncludeFile)
-CHECK_INCLUDE_FILE(openssl/ssl.h HAVE_OPENSSL_H)
-
# Set the default SSL/TLS implementation
-set(ssl_impl, NONE)
-if (HAVE_OPENSSL_H)
+find_package(OpenSSL)
+
+set(ssl_impl, none)
+if (OPENSSL_FOUND)
set(ssl_impl openssl)
-endif(HAVE_OPENSSL_H)
+endif(OPENSSL_FOUND)
set(SSL_IMPL ${ssl_impl} CACHE STRING "Library to use for SSL/TLS support.
Valid values: 'none','openssl'")
configure_file (
@@ -44,7 +43,7 @@ add_custom_command (
# Link in openssl if present
if (SSL_IMPL STREQUAL openssl)
set (pn_driver_ssl_impl src/ssl/openssl.c)
- set (SSL_LIB ssl crypto)
+ set (SSL_LIB ${OPENSSL_LIBRARIES})
else (SSL_IMPL STREQUAL openssl)
set (pn_driver_ssl_impl src/ssl/ssl_stub.c)
endif (SSL_IMPL STREQUAL openssl)
Modified: qpid/proton/trunk/proton-c/pn_config.h.in
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/pn_config.h.in?rev=1393289&r1=1393288&r2=1393289&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/pn_config.h.in (original)
+++ qpid/proton/trunk/proton-c/pn_config.h.in Wed Oct 3 04:46:21 2012
@@ -25,6 +25,4 @@
#define PN_VERSION_MAJOR @PN_VERSION_MAJOR@
#define PN_VERSION_MINOR @PN_VERSION_MINOR@
-#cmakedefine HAVE_OPENSSL_H 1
-
#endif /* pn_config.h */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
