[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2474: Set the keywords and eol-style properties on FindOpenSSL.cma (in vidalia/trunk: . cmake)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2474: Set the keywords and eol-style properties on FindOpenSSL.cma (in vidalia/trunk: . cmake)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Tue, 1 Apr 2008 22:00:25 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Tue, 01 Apr 2008 22:00:30 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2008-04-01 22:00:24 -0400 (Tue, 01 Apr 2008)
New Revision: 2474

Modified:
   vidalia/trunk/
   vidalia/trunk/cmake/FindOpenSSL.cmake
Log:
 r288@lysithea:  edmanm | 2008-04-01 19:55:16 -0400
 Set the keywords and eol-style properties on FindOpenSSL.cmake.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r288] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/cmake/FindOpenSSL.cmake
===================================================================
--- vidalia/trunk/cmake/FindOpenSSL.cmake	2008-03-31 21:18:39 UTC (rev 2473)
+++ vidalia/trunk/cmake/FindOpenSSL.cmake	2008-04-02 02:00:24 UTC (rev 2474)
@@ -1,5 +1,5 @@
 ##
-##  $Id: CMakeLists.txt 2362 2008-02-29 04:30:11Z edmanm $
+##  $Id$
 ## 
 ##  This file is part of Vidalia, and is subject to the license terms in the
 ##  LICENSE file, found in the top level directory of this distribution. If 
@@ -8,109 +8,109 @@
 ##  http://www.vidalia-project.net/. No part of Vidalia, including this file,
 ##  may be copied, modified, propagated, or distributed except according to
 ##  the terms described in the LICENSE file.
-##
-##  This file incorporates work covered by the following copyright and
-##  permission notice:
-##
-##  Copyright (c) 2006, Alexander Neundorf, <neundorf@xxxxxxx>
-##
-##  Redistribution and use in source and binary forms, with or without
-##  modification, are permitted provided that the following conditions are met:
-##
-##   * Redistributions of source code must retain the above copyright notice,
-##     this list of conditions and the following disclaimer.
-##
-##   * Redistributions in binary form must reproduce the above copyright notice,
-##     this list of conditions and the following disclaimer in the documentation
-##     and/or other materials provided with the distribution.
-##
-##   * Neither the names of the copyright owners nor the names of its
-##     contributors may be used to endorse or promote products derived from this
-##     software without specific prior written permission.
-##
-##  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-##  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-##  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-##  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-##  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-##  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-##  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-##  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-##  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-##  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-##  POSSIBILITY OF SUCH DAMAGE.
-##
-
-## Tries to find the required OpenSSL libraries. Once done this will define
-## the variable OPENSSL_LIBRARIES.
-
-message(STATUS "Looking for OpenSSL libraries")
-if (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(OPENSSL_LIBSSL_DEBUG
-    NAMES ssleay32MDd ssl ssleay32
-    PATHS ${OPENSSL_LIBRARY_DIR}
-  )
-  find_library(OPENSSL_LIBSSL_RELEASE
-    NAMES ssleay32MD ssl ssleay32
-    PATHS ${OPENSSL_LIBRARY_DIR}
-  )
-  find_library(OPENSSL_LIBCRYPTO_DEBUG
-    NAMES libeay32MDd crypto libeay32
-    PATHS ${OPENSSL_LIBRARY_DIR}
-  )
-  find_library(OPENSSL_LIBCRYPTO_RELEASE
-    NAMES libeay32MD crypto libeay32
-    PATHS ${OPENSSL_LIBRARY_DIR}
-  )
-   
-  if (MSVC_IDE)
-    if (NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
-      message(FATAL_ERROR
-	      "Could not find the debug and release version of libssl.")
-    endif(NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
-    if (NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
-      message(FATAL_ERROR
-	      "Could not find the debug and release version of libcrypto.")
-    endif(NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
-
-    set(OPENSSL_LIBSSL
-      optimized ${OPENSSL_LIBSSL_RELEASE} 
-      debug ${OPENSSL_LIBSSL_DEBUG})
-    set(OPENSSL_LIBCRYPTO
-      optimized ${OPENSSL_LIBCRYPTO_RELEASE}
-      debug ${OPENSSL_LIBCRYPTO_DEBUG})
-  else(MSVC_IDE)
-    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
-    if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-      set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_DEBUG})
-      set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_DEBUG})
-    else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-      set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_RELEASE})
-      set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_RELEASE})
-    endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-  endif(MSVC_IDE)
-  mark_as_advanced(OPENSSL_LIBSSL_DEBUG   OPENSSL_LIBCRYPTO_DEBUG
-                   OPENSSL_LIBSSL_RELEASE OPENSSL_LIBCRYPTO_RELEASE)
-else(MSVC)
-  find_library(OPENSSL_LIBSSL NAMES ssl ssleay32)
-  find_library(OPENSSL_LIBCRYPTO NAMES crypto libeay32)
-endif(MSVC)
-
-
-if (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
-  set(OPENSSL_LIBRARIES ${OPENSSL_LIBSSL} ${OPENSSL_LIBCRYPTO})
-  mark_as_advanced(OPENSSL_LIBSSL OPENSSL_LIBCRYPTO)
-  mark_as_advanced(OPENSSL_LIBRARIES)
-  message(STATUS "Looking for OpenSSL libraries - found")
-else (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
-  if (NOT OPENSSL_LIBSSL)
-    message(FATAL_ERROR "Could not find libssl.")
-  else (NOT OPENSSL_LIBSSL)
-    message(FATAL_ERROR "Could not find libcrypto.")
-  endif (NOT OPENSSL_LIBSSL)
-endif(OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
-
+##
+##  This file incorporates work covered by the following copyright and
+##  permission notice:
+##
+##  Copyright (c) 2006, Alexander Neundorf, <neundorf@xxxxxxx>
+##
+##  Redistribution and use in source and binary forms, with or without
+##  modification, are permitted provided that the following conditions are met:
+##
+##   * Redistributions of source code must retain the above copyright notice,
+##     this list of conditions and the following disclaimer.
+##
+##   * Redistributions in binary form must reproduce the above copyright notice,
+##     this list of conditions and the following disclaimer in the documentation
+##     and/or other materials provided with the distribution.
+##
+##   * Neither the names of the copyright owners nor the names of its
+##     contributors may be used to endorse or promote products derived from this
+##     software without specific prior written permission.
+##
+##  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+##  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+##  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+##  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+##  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+##  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+##  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+##  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+##  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+##  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+##  POSSIBILITY OF SUCH DAMAGE.
+##
+
+## Tries to find the required OpenSSL libraries. Once done this will define
+## the variable OPENSSL_LIBRARIES.
+
+message(STATUS "Looking for OpenSSL libraries")
+if (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(OPENSSL_LIBSSL_DEBUG
+    NAMES ssleay32MDd ssl ssleay32
+    PATHS ${OPENSSL_LIBRARY_DIR}
+  )
+  find_library(OPENSSL_LIBSSL_RELEASE
+    NAMES ssleay32MD ssl ssleay32
+    PATHS ${OPENSSL_LIBRARY_DIR}
+  )
+  find_library(OPENSSL_LIBCRYPTO_DEBUG
+    NAMES libeay32MDd crypto libeay32
+    PATHS ${OPENSSL_LIBRARY_DIR}
+  )
+  find_library(OPENSSL_LIBCRYPTO_RELEASE
+    NAMES libeay32MD crypto libeay32
+    PATHS ${OPENSSL_LIBRARY_DIR}
+  )
+   
+  if (MSVC_IDE)
+    if (NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
+      message(FATAL_ERROR
+	      "Could not find the debug and release version of libssl.")
+    endif(NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
+    if (NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
+      message(FATAL_ERROR
+	      "Could not find the debug and release version of libcrypto.")
+    endif(NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
+
+    set(OPENSSL_LIBSSL
+      optimized ${OPENSSL_LIBSSL_RELEASE} 
+      debug ${OPENSSL_LIBSSL_DEBUG})
+    set(OPENSSL_LIBCRYPTO
+      optimized ${OPENSSL_LIBCRYPTO_RELEASE}
+      debug ${OPENSSL_LIBCRYPTO_DEBUG})
+  else(MSVC_IDE)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
+    if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+      set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_DEBUG})
+      set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_DEBUG})
+    else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+      set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_RELEASE})
+      set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_RELEASE})
+    endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+  endif(MSVC_IDE)
+  mark_as_advanced(OPENSSL_LIBSSL_DEBUG   OPENSSL_LIBCRYPTO_DEBUG
+                   OPENSSL_LIBSSL_RELEASE OPENSSL_LIBCRYPTO_RELEASE)
+else(MSVC)
+  find_library(OPENSSL_LIBSSL NAMES ssl ssleay32)
+  find_library(OPENSSL_LIBCRYPTO NAMES crypto libeay32)
+endif(MSVC)
+
+
+if (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+  set(OPENSSL_LIBRARIES ${OPENSSL_LIBSSL} ${OPENSSL_LIBCRYPTO})
+  mark_as_advanced(OPENSSL_LIBSSL OPENSSL_LIBCRYPTO)
+  mark_as_advanced(OPENSSL_LIBRARIES)
+  message(STATUS "Looking for OpenSSL libraries - found")
+else (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+  if (NOT OPENSSL_LIBSSL)
+    message(FATAL_ERROR "Could not find libssl.")
+  else (NOT OPENSSL_LIBSSL)
+    message(FATAL_ERROR "Could not find libcrypto.")
+  endif (NOT OPENSSL_LIBSSL)
+endif(OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+


Property changes on: vidalia/trunk/cmake/FindOpenSSL.cmake
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native
Prev by Author: [vidalia-svn] r2539: Improved Finnish Help translation (vidalia/trunk/src/vidalia/help/content/fi)
Next by Author: [vidalia-svn] r2475: Initial merge of sjmurdoch's patch to add UPnP support using (in vidalia/trunk: . src/vidalia src/vidalia/config)
Next by thread: [vidalia-svn] r2475: Initial merge of sjmurdoch's patch to add UPnP support using (in vidalia/trunk: . src/vidalia src/vidalia/config)
Index(es):
- Author
- Thread