diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 13:10:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-18 13:10:09 +0300 |
| commit | 69628551858825bebc3f1653882920e4f6555cbb (patch) | |
| tree | d744f4354c81c93ac76bf6530eefde17eb093177 /zlib | |
| parent | 26b594e4110b4f7e6f2bcfbdb4c87aef65652bc0 (diff) | |
| parent | 10ebdb7f1d7a3f6aa6a91b40a9d90f482da08e58 (diff) | |
| download | mariadb-git-69628551858825bebc3f1653882920e4f6555cbb.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index 5d58f9a42b6..f654f98bfc4 100644 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -124,6 +124,8 @@ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" ADD_CONVENIENCE_LIBRARY(zlib STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +RESTRICT_SYMBOL_EXPORTS(zlib) + if(NOT CYGWIN) # This property causes shared libraries on Linux to have the full version @@ -142,7 +144,4 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS") elseif(UNIX) # On unix-like platforms the library is almost always called libz set_target_properties(zlib PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() endif() |