Mercurial > hg > orthanc-databases

comparison Resources/CMake/MariaDBConfiguration.cmake @ 184:e8c3c92f2532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgade to mariadb-connector-c 3.1.11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Dec 2020 09:47:14 +0100
parents 2f94b2046d7c
children 7c46155b5bb4
comparison
equal deleted inserted replaced
183:2f94b2046d7c 184:e8c3c92f2532
17 # along with this program. If not, see <http://www.gnu.org/licenses/>. 17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19 19
20 if (STATIC_BUILD OR NOT USE_SYSTEM_MYSQL_CLIENT) 20 if (STATIC_BUILD OR NOT USE_SYSTEM_MYSQL_CLIENT)
21 set(MARIADB_CLIENT_VERSION_MAJOR "10") 21 set(MARIADB_CLIENT_VERSION_MAJOR "10")
22 set(MARIADB_CLIENT_VERSION_MINOR "3") 22 set(MARIADB_CLIENT_VERSION_MINOR "5")
23 set(MARIADB_CLIENT_VERSION_PATCH "6") 23 set(MARIADB_CLIENT_VERSION_PATCH "5")
24 set(MARIADB_PACKAGE_VERSION "3.0.5") 24 set(MARIADB_PACKAGE_VERSION "3.1.11")
25 set(MARIADB_CLIENT_SOURCES_DIR ${CMAKE_BINARY_DIR}/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src) 25 set(MARIADB_CLIENT_SOURCES_DIR ${CMAKE_BINARY_DIR}/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src)
26 set(MARIADB_CLIENT_MD5 "b846584b8b7a39c51a6e83986b57c71c") 26 set(MARIADB_CLIENT_MD5 "cf9da5f0ac9ec72dd8309bdc1d1c6c2f")
27 set(MARIADB_CLIENT_URL "http://orthanc.osimis.io/ThirdPartyDownloads/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src.tar.gz") 27 set(MARIADB_CLIENT_URL "http://orthanc.osimis.io/ThirdPartyDownloads/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}-src.tar.gz")
28 28
29 if (IS_DIRECTORY "${MARIADB_CLIENT_SOURCES_DIR}") 29 if (IS_DIRECTORY "${MARIADB_CLIENT_SOURCES_DIR}")
30 set(FirstRun OFF) 30 set(FirstRun OFF)
31 else() 31 else()
35 DownloadPackage(${MARIADB_CLIENT_MD5} ${MARIADB_CLIENT_URL} "${MARIADB_CLIENT_SOURCES_DIR}") 35 DownloadPackage(${MARIADB_CLIENT_MD5} ${MARIADB_CLIENT_URL} "${MARIADB_CLIENT_SOURCES_DIR}")
36 36
37 if (FirstRun) 37 if (FirstRun)
38 execute_process( 38 execute_process(
39 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 39 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
40 ${CMAKE_CURRENT_LIST_DIR}/../MariaDB/mariadb-connector-c-3.0.5.patch 40 ${CMAKE_CURRENT_LIST_DIR}/../MariaDB/mariadb-connector-c-${MARIADB_PACKAGE_VERSION}.patch
41 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 41 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
42 RESULT_VARIABLE Failure 42 RESULT_VARIABLE Failure
43 ) 43 )
44 44
45 if (Failure) 45 if (Failure)
50 50
51 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckIncludeFiles.cmake) 51 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckIncludeFiles.cmake)
52 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckFunctions.cmake) 52 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckFunctions.cmake)
53 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckTypes.cmake) 53 include(${MARIADB_CLIENT_SOURCES_DIR}/cmake/CheckTypes.cmake)
54 54
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}")
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 60
61 set(HAVE_DLOPEN 1) 61 #set(HAVE_DLOPEN 1) # Not needed anymore in 3.1.11
62 set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR}) 62 set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR})
63 set(MARIADB_PORT 3306) 63 set(MARIADB_PORT 3306)
64 set(MARIADB_UNIX_ADDR "/var/run/mysqld/mysqld.sock") 64 set(MARIADB_UNIX_ADDR "/var/run/mysqld/mysqld.sock")
65 set(DEFAULT_CHARSET "latin1") 65 set(DEFAULT_CHARSET "latin1")
66 set(ENABLED_LOCAL_INFILE "AUTO")
66 67
67 FOREACH(plugin mysql_native_password mysql_old_password pvio_socket) 68 FOREACH(plugin mysql_native_password mysql_old_password pvio_socket)
68 set(EXTERNAL_PLUGINS "${EXTERNAL_PLUGINS} extern struct st_mysql_client_plugin ${plugin}_client_plugin;\n") 69 set(EXTERNAL_PLUGINS "${EXTERNAL_PLUGINS} extern struct st_mysql_client_plugin ${plugin}_client_plugin;\n")
69 set(BUILTIN_PLUGINS "${BUILTIN_PLUGINS} (struct st_mysql_client_plugin *)&${plugin}_client_plugin,\n") 70 set(BUILTIN_PLUGINS "${BUILTIN_PLUGINS} (struct st_mysql_client_plugin *)&${plugin}_client_plugin,\n")
70 ENDFOREACH() 71 ENDFOREACH()