diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2014-05-07 17:09:14 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2014-05-07 17:09:14 +0200 |
| commit | 918837f7289a3cbd032a5cdb85eb55a466ad7c8e (patch) | |
| tree | 0869707eee4b3beb9041706315c754e1763fb42c /zlib | |
| parent | e1da25f62117c8171ddb7e187ac3aedcacbe4088 (diff) | |
| download | mariadb-git-918837f7289a3cbd032a5cdb85eb55a466ad7c8e.tar.gz | |
Backport from trunk:
Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12
We want to upgrade to VS2013 on Windows.
In order to do this, we need to upgrade to cmake 2.8.12
This has introduced some incompatibilities for .pdb files,
and "make install" no longer works.
To reproduce:
cmake --build . --target package --config debug
The fix:
Rather than installing .pdb files for static libraries, we use the /Z7 flag
to store symbolic debugging information in the .obj files.
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index 0be1f976b39..7668ce723b8 100644 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, 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 @@ -23,7 +23,6 @@ SET(ZLIB_SOURCES adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio. ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES}) RESTRICT_SYMBOL_EXPORTS(zlib) -INSTALL_DEBUG_SYMBOLS(zlib) IF(MSVC) INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() |