diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-25 19:12:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-26 00:04:50 +0200 |
| commit | e99c7c8334f842a6515a3116fe2cafd59266a40e (patch) | |
| tree | e441a06bc51c802ef5448b2571ede88cfb911028 /cmake | |
| parent | 230350872c1aa9d2613e6f20305f2cebdce03097 (diff) | |
| download | mariadb-git-e99c7c8334f842a6515a3116fe2cafd59266a40e.tar.gz | |
MDEV-13836 mariadb_config & mysql_config output differ
compile C/C with system zlib, when the server uses system zlib
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mariadb_connector_c.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake index 6773314313b..fe2bcfa4a1f 100644 --- a/cmake/mariadb_connector_c.cmake +++ b/cmake/mariadb_connector_c.cmake @@ -7,10 +7,8 @@ ENDIF() SET(CONC_WITH_SIGNCODE ${SIGNCODE}) SET(SIGN_OPTIONS ${SIGNTOOL_PARAMETERS}) -IF(TARGET zlib) - GET_PROPERTY(ZLIB_LIBRARY_LOCATION TARGET zlib PROPERTY LOCATION) -ELSE() - SET(ZLIB_LIBRARY_LOCATION ${ZLIB_LIBRARY}) +IF(NOT TARGET zlib) + SET(CONC_WITH_EXTERNAL_ZLIB ON) ENDIF() IF(SSL_DEFINES MATCHES "YASSL") |