diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-22 16:45:46 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-22 16:45:46 +0200 |
| commit | 8a68119c9fe1b609f23c1ea09cc536322b35d1a8 (patch) | |
| tree | db7fc56f4a1a17765e07285d89d1a88aad3fe227 | |
| parent | c19d51649aa5976f7638661af265374b3252ff73 (diff) | |
| download | mariadb-git-bb-10.2-connector-c-integ.tar.gz | |
add libmysqlclient's dependencies to the output of mysql_configbb-10.2-connector-c-integ
| -rw-r--r-- | cmake/mariadb_connector_c.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake index 33062c011bd..3f4deffd593 100644 --- a/cmake/mariadb_connector_c.cmake +++ b/cmake/mariadb_connector_c.cmake @@ -4,11 +4,11 @@ IF(WIN32) # todo: libcurl for windows ELSE() - SET(CC_LIBS ${LIBDL} ${LIBM} ${LIBPTHREAD}) + SET(CC_LIBS ${LIBDL} ${LIBM} ${CMAKE_THREAD_LIBS_INIT}) FIND_PACKAGE(OpenSSL) #FIND_PACKAGE(GnuTLS) IF(OPENSSL_FOUND) - SET(CC_LIBS ${CC_LIBS} ${OPENSSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES}) + SET(CC_LIBS ${CC_LIBS} ${OPENSSL_LIBRARIES}) SET(CC_CMAKE_OPTS "-DWITH_SSL=OPENSSL") ELSEIF (GNUTLS_FOUND) SET(CC_LIBS ${CC_LIBS} ${GNUTLS_LIBRARY}) @@ -19,9 +19,14 @@ ELSE() INCLUDE(${CMAKE_SOURCE_DIR}/cmake/iconv.cmake) IF(ICONV_FOUND) IF(ICONV_EXTERNAL) - SET(CC_LIBS ${CC_LIBS} ${ICONV_LIBRARIES}) + IF(NOT ICONV_LIBRARIES MATCHES "libc.so") + SET(CC_LIBS ${CC_LIBS} ${ICONV_LIBRARIES}) + ENDIF() ENDIF() ENDIF() ENDIF() +IF(NOT TARGET zlib) + SET(CC_LIBS ${CC_LIBS} ${ZLIB_LIBRARY}) +ENDIF() +SET(mysqlclient_LIB_DEPENDS ${CC_LIBS} CACHE INTERNAL "") MARK_AS_ADVANCED(CC_LIBS CC_CMAKE_OPTS) - |