[Cmake-commits] [cmake-commits] malaterre committed FindOpenSSL.cmake 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv7863

Modified Files:
	FindOpenSSL.cmake 
Log Message:
FIX: BUG: 0008971 FindOpenSSL improvement. Teaches cmake to find openssl on win32. openssl comes with the crypto libs which are the important part of the openssl project.


Index: FindOpenSSL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSSL.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindOpenSSL.cmake	28 Sep 2009 15:45:38 -0000	1.4
--- FindOpenSSL.cmake	30 Oct 2009 15:35:15 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  # Copyright 2006-2009 Kitware, Inc.
  # Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
  #
  # Distributed under the OSI-approved BSD License (the "License");
***************
*** 28,32 ****
  ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
  
! FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )
  
  IF(WIN32 AND MSVC)
--- 29,36 ----
  ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
  
! # 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"
! )
  
  IF(WIN32 AND MSVC)
***************
*** 35,44 ****
     # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
  
!    FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32)
!    FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32)
  
     IF(MSVC_IDE)
        IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
!          SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
        ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
           SET(OPENSSL_LIBRARIES NOTFOUND)
--- 39,58 ----
     # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
  
!    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"
!      )
!    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"
!      )
!    FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32
!      PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
!      )
!    FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32
!      PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
!      )
  
     IF(MSVC_IDE)
        IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
!          SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
        ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
           SET(OPENSSL_LIBRARIES NOTFOUND)
***************
*** 48,60 ****
        STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
        IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
!          SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG})
        ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
!          SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE})
        ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
     ENDIF(MSVC_IDE)
     MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
  ELSE(WIN32 AND MSVC)
  
!    FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD )
  
  ENDIF(WIN32 AND MSVC)
--- 62,79 ----
        STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
        IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
!          SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
        ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
!          SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE})
        ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
     ENDIF(MSVC_IDE)
     MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
+    MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
  ELSE(WIN32 AND MSVC)
  
!    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)
! 
!    SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
  
  ENDIF(WIN32 AND MSVC)