prepare for merging to cmake

Alex

svn path=/trunk/KDE/kdelibs/; revision=586500

1 files changed, 55 insertions, 68 deletions

diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index f4bd85bd..0172df83 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -4,80 +4,67 @@
 #  OPENSSL_FOUND - system has the OpenSSL library

 #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory

 #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL

-#

+

 # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>

 #

 # Redistribution and use is allowed according to the terms of the BSD license.

 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

 

 

-if(OPENSSL_LIBRARIES)

-   SET(LIB_FOUND 1)

-endif(OPENSSL_LIBRARIES)

+IF(OPENSSL_LIBRARIES)

+   SET(OpenSSL_FIND_QUIETLY TRUE)

+ENDIF(OPENSSL_LIBRARIES)

 

-if(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

+IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

    SET(LIB_FOUND 1)

-endif(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

-

-if (OPENSSL_INCLUDE_DIR AND LIB_FOUND)

-

-  # in cache already

-  SET(OPENSSL_FOUND TRUE)

-

-else (OPENSSL_INCLUDE_DIR AND LIB_FOUND)

-

-  FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h

-     /usr/include/

-     /usr/local/include/

-  )

-

-  if(WIN32 AND MSVC)

-      # /MD and /MDd are the standard values - if somone wants to use

-      # others, the libnames have to change here too

-      # 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)

-          MESSAGE(FATAL_ERROR "Could not find the debug and release version of openssl")

-        ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

-      ELSE(MSVC_IDE)

-        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

-      PATHS

-      /usr/lib

-      /usr/local/lib

-   )

-

-  endif(WIN32 AND MSVC)

-

-  if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

-     set(OPENSSL_FOUND TRUE)

-  endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

-

-  if (OPENSSL_FOUND)

-     if (NOT OpenSSL_FIND_QUIETLY)

-        message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")

-     endif (NOT OpenSSL_FIND_QUIETLY)

-  else (OPENSSL_FOUND)

-     if (OpenSSL_FIND_REQUIRED)

-        message(FATAL_ERROR "Could NOT find OpenSSL")

-     endif (OpenSSL_FIND_REQUIRED)

-  endif (OPENSSL_FOUND)

-

-  MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)

+ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

+

+FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )

+

+IF(WIN32 AND MSVC)

+   # /MD and /MDd are the standard values - if somone wants to use

+   # others, the libnames have to change here too

+   # 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)

+         MESSAGE(FATAL_ERROR "Could not find the debug and release version of openssl")

+      ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)

+   ELSE(MSVC_IDE)

+      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)

+

+IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

+   SET(OPENSSL_FOUND TRUE)

+ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

+   SET(OPENSSL_FOUND FALSE)

+ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

+

+IF (OPENSSL_FOUND)

+   IF (NOT OpenSSL_FIND_QUIETLY)

+      MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")

+   ENDIF (NOT OpenSSL_FIND_QUIETLY)

+ELSE (OPENSSL_FOUND)

+   IF (OpenSSL_FIND_REQUIRED)

+      MESSAGE(FATAL_ERROR "Could NOT find OpenSSL")

+   ENDIF (OpenSSL_FIND_REQUIRED)

+ENDIF (OPENSSL_FOUND)

+

+MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)

 

-endif (OPENSSL_INCLUDE_DIR AND LIB_FOUND)