diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-04-21 23:19:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-04-21 23:19:20 +0400 |
| commit | 5fb0d1601668b88c44845691bb0d3e61cb289740 (patch) | |
| tree | 4eeb284729b08fff11d3310d2acfd82269b25d63 /cmake/zlib.cmake | |
| parent | 1de77ee1ade8937faa941a49e820179e61605ca4 (diff) | |
| download | mariadb-git-5fb0d1601668b88c44845691bb0d3e61cb289740.tar.gz | |
Fixing build-bot compilation failure on SolarisX86,
who has two different incompatible copies of zlib installed:
(in /usr and in /usr/local).
cmake errorneously chose *.h file from /usr/local/include,
while zlib.a/zlib.so from /usr/lib/. Compilation failed
because of a missing symbol gzopen64.
modified:
@ cmake/zlib.cmake
Removing the line (as suggested by Vlad) which made cmake choose
the wrong library.
Note: this line used to be a hack for old HP machines,
it's not needed anymore.
Diffstat (limited to 'cmake/zlib.cmake')
| -rw-r--r-- | cmake/zlib.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index a8866d8d2c6..a3960c2a9da 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -58,7 +58,6 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS) CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32) SET(CMAKE_REQUIRED_LIBRARIES) IF(HAVE_CRC32) - SET(ZLIB_LIBRARY z CACHE INTERNAL "System zlib library") SET(WITH_ZLIB "system" CACHE STRING "Which zlib to use (possible values are 'bundled' or 'system')") SET(ZLIB_SOURCES "") ELSE() |