comparison Resources/CMake/MariaDBConfiguration.cmake @ 7:a84b487ccbdc

fix openssl linking
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Jul 2018 08:13:20 +0200
parents 7cea966b6829
children 714c5d2bee76
comparison
equal deleted inserted replaced
2:17bce6a07b2b 7:a84b487ccbdc
55 set(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}") 55 set(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}")
56 set(MARIADB_BASE_VERSION "mariadb-${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}") 56 set(MARIADB_BASE_VERSION "mariadb-${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}")
57 math(EXPR MARIADB_VERSION_ID "${MARIADB_CLIENT_VERSION_MAJOR} * 10000 + 57 math(EXPR MARIADB_VERSION_ID "${MARIADB_CLIENT_VERSION_MAJOR} * 10000 +
58 ${MARIADB_CLIENT_VERSION_MINOR} * 100 + 58 ${MARIADB_CLIENT_VERSION_MINOR} * 100 +
59 ${MARIADB_CLIENT_VERSION_PATCH}") 59 ${MARIADB_CLIENT_VERSION_PATCH}")
60
61 add_definitions(
62 -DHAVE_OPENSSL=1
63 -DHAVE_TLS=1
64 -DHAVE_REMOTEIO=1
65 -DHAVE_COMPRESS=1
66 -DLIBMARIADB
67 -DTHREAD
68 )
69 60
70 set(HAVE_DLOPEN 1) 61 set(HAVE_DLOPEN 1)
71 set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR}) 62 set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR})
72 set(MARIADB_PORT 3306) 63 set(MARIADB_PORT 3306)
73 set(MARIADB_UNIX_ADDR "/var/run/mysqld/mysqld.sock") 64 set(MARIADB_UNIX_ADDR "/var/run/mysqld/mysqld.sock")
130 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/auth/my_auth.c 121 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/auth/my_auth.c
131 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/auth/old_password.c 122 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/auth/old_password.c
132 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/pvio/pvio_socket.c 123 ${MARIADB_CLIENT_SOURCES_DIR}/plugins/pvio/pvio_socket.c
133 ) 124 )
134 125
126 set_property(
127 SOURCE ${MYSQL_CLIENT_SOURCES}
128 PROPERTY COMPILE_DEFINITIONS "HAVE_OPENSSL=1;HAVE_TLS=1;HAVE_REMOTEIO=1;HAVE_COMPRESS=1;LIBMARIADB;THREAD"
129 )
130
135 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") 131 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
136 link_libraries(shlwapi) 132 link_libraries(shlwapi)
137 endif() 133 endif()
138 134
139 else() 135 else()