From 66dca3e04dc5f4f1c7fb38c24d1c8c5d2d5ac8fe Mon Sep 17 00:00:00 2001 From: Miralqir Date: Fri, 9 Aug 2024 14:31:08 +0300 Subject: [PATCH] Remove distribution specific code in FindMySQL.cmake --- cmake/FindMySQL.cmake | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index abec4027..d15f7abd 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -18,30 +18,24 @@ if( UNIX ) "preferred path to MySQL (mysql_config)" ) - # use mariadb_config on Gentoo - find_program(LSB_RELEASE_EXEC lsb_release) - execute_process(COMMAND ${LSB_RELEASE_EXEC} -is - OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if( ${LSB_RELEASE_ID_SHORT} STREQUAL "Gentoo" ) - set(MY_TMP "mariadb_config") - else() - set(MY_TMP "mysql_config") - endif() - - set(MYSQL_CONFIG_EXECUTABLE_NAME ${MY_TMP} CACHE STRING - "mysql_config executable name" - ) - - find_program(MYSQL_CONFIG ${MYSQL_CONFIG_EXECUTABLE_NAME} + # try mariadb first + find_program(MYSQL_CONFIG mariadb_config ${MYSQL_CONFIG_PREFER_PATH} /usr/local/mysql/bin/ /usr/local/bin/ /usr/bin/ ) + if( NOT MYSQL_CONFIG ) + # fallback to mysql + find_program(MYSQL_CONFIG mysql_config + ${MYSQL_CONFIG_PREFER_PATH} + /usr/local/mysql/bin/ + /usr/local/bin/ + /usr/bin/ + ) + endif() + if( MYSQL_CONFIG ) message(STATUS "Using mysql-config: ${MYSQL_CONFIG}") # set INCLUDE_DIR