--- old/Modules/FindOpenSSL.cmake	2010-02-16 19:46:48.000000000 +0100
+++ new/Modules/FindOpenSSL.cmake	2010-02-22 12:30:44.000000000 +0100
@@ -4,6 +4,13 @@
 #  OPENSSL_FOUND - system has the OpenSSL library
 #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
 #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+#  OPENSSL_VERSION - the OpenSSL version found (MAJOR.MINOR.PATCH)
+#
+# If OpenSSL is installed in a not-standard location, you can set the CMake
+# variable OPENSSL_ROOT_DIR (or the system path OPENSSL_ROOT_DIR) to the
+# main location of your OpenSSL installation in order to find the needed
+# files.
+#
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -23,6 +30,9 @@
 # http://www.slproweb.com/products/Win32OpenSSL.html
 FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
   PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/include"
+    "${OPENSSL_ROOT_DIR}/include"
+    ENV OPENSSL_ROOT_DIR
+  PATH_SUFFIXES "include"
 )
 
 IF(WIN32 AND NOT CYGWIN)
@@ -44,16 +54,32 @@
     # ssleay32MD.lib is identical to ../ssleay32.lib
     FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "VC" "lib/VC"
+    )
+
     FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "VC" "lib/VC"
+    )
+
     FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "VC" "lib/VC"
+    )
+
     FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "VC" "lib/VC"
+    )
+
     if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
       set( OPENSSL_LIBRARIES
         optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE}
@@ -68,38 +94,93 @@
     # same player, for MingW
     FIND_LIBRARY(LIB_EAY NAMES libeay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "MinGW" "lib/MinGW"
+    )
+
     FIND_LIBRARY(SSL_EAY NAMES ssleay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib" "MinGW" "lib/MinGW"
+    )
+
     MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   ELSE(MSVC)
     # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
     FIND_LIBRARY(LIB_EAY NAMES libeay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib"
+    )
+
     FIND_LIBRARY(SSL_EAY NAMES ssleay32
       PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
-      )
+        "${OPENSSL_ROOT_DIR}/lib"
+        ENV OPENSSL_ROOT_DIR
+      PATH_SUFFIXES "lib"
+    )
+
     MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   ENDIF(MSVC)
 ELSE(WIN32 AND NOT CYGWIN)
 
-  FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD)
-  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto)
-  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
+  FIND_LIBRARY(OPENSSL_SSL_LIBRARIES
+    NAMES ssl ssleay32 ssleay32MD
+    PATHS
+      "${OPENSSL_ROOT_DIR}/lib"
+      ENV OPENSSL_ROOT_DIR
+    PATH_SUFFIXES "lib"
+  )
+
+  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES
+    NAMES crypto
+    PATHS
+      "${OPENSSL_ROOT_DIR}/lib"
+      ENV OPENSSL_ROOT_DIR
+    PATH_SUFFIXES "lib"
+  )
 
+  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
   SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
 
 ENDIF(WIN32 AND NOT CYGWIN)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenSSL DEFAULT_MSG
+find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
   OPENSSL_LIBRARIES 
   OPENSSL_INCLUDE_DIR
 )
 
+IF(OPENSSL_FOUND)
+  file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*")
+
+  string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" OPENSSL_VERSION_MAJOR "${openssl_version_str}")
+  string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" OPENSSL_VERSION_MINOR  "${openssl_version_str}")
+  string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" OPENSSL_VERSION_PATCH "${openssl_version_str}")
+    
+  string(REGEX REPLACE "^0" "" OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_MINOR}")
+  string(REGEX REPLACE "^0" "" OPENSSL_VERSION_PATCH "${OPENSSL_VERSION_PATCH}")
+    
+  set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_PATCH}")
+  
+  if(OpenSSL_FIND_VERSION)
+    if(OpenSSL_FIND_VERSION_EXACT AND NOT ${OPENSSL_VERSION} VERSION_EQUAL ${OpenSSL_FIND_VERSION})
+      message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) does not match the required one (${OpenSSL_FIND_VERSION}), aborting.")
+    elseif(${OPENSSL_VERSION} VERSION_LESS ${OpenSSL_FIND_VERSION})
+      if(OpenSSL_FIND_REQUIRED)
+        message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OpenSSL_FIND_VERSION}), aborting.")
+      else(OpenSSL_FIND_REQUIRED)
+        message("OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OpenSSL_FIND_VERSION}), continue without OpenSSL support.")
+        set(OPENSSL_FOUND FALSE)
+      endif(OpenSSL_FIND_REQUIRED)
+    endif()
+  endif(OpenSSL_FIND_VERSION)
+ENDIF (OPENSSL_FOUND)
+
 MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)