Thread: [QTerm-cvs] SF.net SVN: qterm:[584] trunk/qterm-qt4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 584
          http://qterm.svn.sourceforge.net/qterm/?rev=584&view=rev
Author:   hephooey
Date:     2008-12-15 18:30:15 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
New crypto module to replace the outdated openssl module, fix
--as-needed

Modified Paths:
--------------
    trunk/qterm-qt4/src/CMakeLists.txt

Added Paths:
-----------
    trunk/qterm-qt4/cmake/FindOpenSSLCrypto.cmake

Removed Paths:
-------------
    trunk/qterm-qt4/cmake/FindOpenSSL.cmake

Deleted: trunk/qterm-qt4/cmake/FindOpenSSL.cmake
===================================================================

--- trunk/qterm-qt4/cmake/FindOpenSSL.cmake	2008-12-15 18:30:09 UTC (rev 583)
+++ trunk/qterm-qt4/cmake/FindOpenSSL.cmake	2008-12-15 18:30:15 UTC (rev 584)
@@ -1,42 +0,0 @@
-# - Try to find the OpenSSL encryption library
-# Once done this will define
-#
-#  OPENSSL_FOUND - system has the OpenSSL library
-#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
-#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
-
-if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
-
-  # in cache already
-  SET(OPENSSL_FOUND TRUE)
-
-else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
-
-  FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
-     /usr/include/
-     /usr/local/include/
-  )
-  
-  FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
-     PATHS
-     /usr/lib
-     /usr/local/lib
-  )
-  
-  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 (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)

Added: trunk/qterm-qt4/cmake/FindOpenSSLCrypto.cmake
===================================================================
--- trunk/qterm-qt4/cmake/FindOpenSSLCrypto.cmake	                        (rev 0)
+++ trunk/qterm-qt4/cmake/FindOpenSSLCrypto.cmake	2008-12-15 18:30:15 UTC (rev 584)
@@ -0,0 +1,76 @@
+# A Modified Version of FindOpenSSL.cmake from CMake 2.6.2
+# Because we only need the crypto library for QTerm
+
+# - Try to find the OpenSSL encryption library
+# Once done this will define
+#
+#  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, <neu...@kd...>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+IF(OPENSSL_CRYPTO_LIBRARIES)
+   SET(OpenSSL_CRYPTO_FIND_QUIETLY TRUE)
+ENDIF(OPENSSL_CRYPTO_LIBRARIES)
+
+IF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+   SET(LIB_FOUND 1)
+ENDIF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+
+FIND_PATH(OPENSSL_CRYPTO_INCLUDE_DIR openssl/ssl.h )
+
+IF(WIN32 AND MSVC)
+   # Not sure if this will work or not, since MSVC can not be used to
+   # compile QTerm
+   # /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(LIB_EAY_DEBUG NAMES libeay32MDd libeay libeay32)
+   FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay libeay32)
+
+   IF(MSVC_IDE)
+      IF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+         SET(OPENSSL_CRYPTO_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
+      ELSE(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+         SET(OPENSSL_CRYPTO LIBRARIES NOTFOUND)
+         MESSAGE(STATUS "Could not find the debug and release version of openssl")
+      ENDIF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+   ELSE(MSVC_IDE)
+      STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
+      IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+         SET(OPENSSL_CRYPTO_LIBRARIES ${LIB_EAY_DEBUG})
+      ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+         SET(OPENSSL_CRYPTO_LIBRARIES ${LIB_EAY_RELEASE})
+      ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+   ENDIF(MSVC_IDE)
+   MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
+ELSE(WIN32 AND MSVC)
+
+   FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto libeay32 )
+
+ENDIF(WIN32 AND MSVC)
+
+IF(OPENSSL_CRYPTO_INCLUDE_DIR AND OPENSSL_CRYPTO_LIBRARIES)
+   SET(OPENSSL_CRYPTO_FOUND TRUE)
+ELSE(OPENSSL_CRYPTO_INCLUDE_DIR AND OPENSSL_CRYPTO_LIBRARIES)
+   SET(OPENSSL_CRYPTO_FOUND FALSE)
+ENDIF (OPENSSL_CRYPTO_INCLUDE_DIR AND OPENSSL_CRYPTO_LIBRARIES)
+
+IF (OPENSSL_CRYPTO_FOUND)
+   IF (NOT OpenSSL_CRYPTO_FIND_QUIETLY)
+      MESSAGE(STATUS "Found OpenSSL Crypto Library: ${OPENSSL_CRYPTO_LIBRARIES}")
+   ENDIF (NOT OpenSSL_CRYPTO_FIND_QUIETLY)
+ELSE (OPENSSL_CRYPTO_FOUND)
+   IF (OpenSSL_CRYPTO_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could NOT find OpenSSL")
+   ENDIF (OpenSSL_CRYPTO_FIND_REQUIRED)
+ENDIF (OPENSSL_CRYPTO_FOUND)
+
+MARK_AS_ADVANCED(OPENSSL_CRYPTO_INCLUDE_DIR OPENSSL_CRYPTO_LIBRARIES)
+

Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt	2008-12-15 18:30:09 UTC (rev 583)
+++ trunk/qterm-qt4/src/CMakeLists.txt	2008-12-15 18:30:15 UTC (rev 584)
@@ -5,12 +5,12 @@
 option(QTERM_ENABLE_DBUS "Build DBus Support" ON)
 option(QTERM_ENABLE_TEST "Build the tests")
 if(QTERM_ENABLE_SSH)
-   find_package(OpenSSL)
-   if(OPENSSL_FOUND)
+   find_package(OpenSSLCrypto)
+   if(OPENSSL_CRYPTO_FOUND)
       message(STATUS "OpenSSL found, enable SSH support")
       add_definitions(-DSSH_ENABLED)
-      include_directories(${OPENSSL_INCLUDE_DIR})
-      set(optionalLibs ${optionalLibs} ${OPENSSL_LIBRARIES})
+      include_directories(${OPENSSL_CRYPTO_INCLUDE_DIR})
+      set(optionalLibs ${optionalLibs} ${OPENSSL_CRYPTO_LIBRARIES})
       set(optionalSources ${optionalSources}
       ssh/auth.cpp
       ssh/channel.cpp
@@ -19,7 +19,7 @@
       ssh/packet.cpp
       ssh/socket.cpp
       ssh/transport.cpp)
-   endif(OPENSSL_FOUND)
+   endif(OPENSSL_CRYPTO_FOUND)
 endif(QTERM_ENABLE_SSH)
 if(QTERM_ENABLE_DBUS)
    if(QT_QTDBUS_FOUND)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [QTerm-cvs] SF.net SVN: qterm:[584] trunk/qterm-qt4

qterm-cvs