diff options
| author | Aditya A <aditya.a@oracle.com> | 2018-07-09 17:25:49 +0530 |
|---|---|---|
| committer | Aditya A <aditya.a@oracle.com> | 2018-07-09 17:25:49 +0530 |
| commit | c54271723c6f2f4e5b77cd8faf91e89412730209 (patch) | |
| tree | 98846d0d72c9d916a60559b0c8f091ab8466e16e /CMakeLists.txt | |
| parent | 28b052190e377bdfe176e1dc71d268b94c832263 (diff) | |
| download | mariadb-git-c54271723c6f2f4e5b77cd8faf91e89412730209.tar.gz | |
Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIES
Upgrading the zlib lib to 1.2.11
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 154273576d7..89f71fa8580 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved. # # 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 @@ -382,6 +382,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include) # Add bundled or system zlib. MYSQL_CHECK_ZLIB_WITH_COMPRESS() +IF(BUILD_BUNDLED_ZLIB) + INCLUDE_DIRECTORIES(SYSTEM + ${CMAKE_CURRENT_SOURCE_DIR}/zlib + ${CMAKE_CURRENT_BINARY_DIR}/zlib + ) +ENDIF() # Optionally add bundled yassl/taocrypt or system openssl. MYSQL_CHECK_SSL() # Add readline or libedit. |