diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-07-21 20:11:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-21 20:11:07 +0200 |
| commit | 6190a02f3593f82e2d4916ed660afb5e5d631a5a (patch) | |
| tree | f6fc56fd7aad1a332f9fc6850b2d579198d09ff8 /cmake | |
| parent | cf6d83e7d68bd2bc0af0404bf4dd15218847074d (diff) | |
| parent | 4c387945f0f8d5df84ae987c4a4bba7675815c72 (diff) | |
| download | mariadb-git-6190a02f3593f82e2d4916ed660afb5e5d631a5a.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/for_clients.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake index 2c2c965df64..27b1430f33e 100644 --- a/cmake/for_clients.cmake +++ b/cmake/for_clients.cmake @@ -21,7 +21,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) FOREACH(lib ${${target}_LIB_DEPENDS}) # Filter out "general", it is not a library, just CMake hint # Also, remove duplicates - IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") + IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "zlib") IF (lib MATCHES "^\\-") SET(${var} "${${var}} ${lib} ") ELSEIF(lib MATCHES "^/") |