diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
| commit | bb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch) | |
| tree | 3b3bcacec8faab66bf6756f20dff1e45462fdc1c /cmake/ssl.cmake | |
| parent | add44e684cb9f1b46d1d5facdf6255360fa7b656 (diff) | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| download | mariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index be25c3bbd28..65abb27923b 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -1,4 +1,5 @@ -# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. +# Copyright (c) 2011, 2017, MariaDB Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -11,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # We support different versions of SSL: # - "bundled" uses source code in <source dir>/extra/yassl @@ -124,7 +125,7 @@ MACRO (MYSQL_CHECK_SSL) SET(OPENSSL_ROOT_DIR ${WITH_SSL_PATH}) ENDIF() ENDIF() - FIND_PACKAGE(OpenSSL 1.0.0) + FIND_PACKAGE(OpenSSL) IF(OPENSSL_FOUND) SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY}) INCLUDE(CheckSymbolExists) @@ -159,7 +160,7 @@ MACRO (MYSQL_CHECK_SSL) HAVE_EncryptAes128Gcm) ELSE() IF(WITH_SSL STREQUAL "system") - MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") + MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") ENDIF() MYSQL_USE_BUNDLED_SSL() ENDIF() |