From 8ea40616d1b8fd5ab799c2ca914a4e7cc60057f0 Mon Sep 17 00:00:00 2001 From: RElesgoe Date: Fri, 5 Jun 2020 00:02:26 -0700 Subject: [PATCH] Revert FindMySQL.cmake to old version --- cmake/Modules/FindMySQL.cmake | 155 +++++++++++++++------------------- 1 file changed, 70 insertions(+), 85 deletions(-) diff --git a/cmake/Modules/FindMySQL.cmake b/cmake/Modules/FindMySQL.cmake index 1adb056..900b9b3 100644 --- a/cmake/Modules/FindMySQL.cmake +++ b/cmake/Modules/FindMySQL.cmake @@ -1,95 +1,80 @@ -#-------------------------------------------------------- -# Copyright (C) 1995-2007 MySQL AB +# - Try to find MySQL. +# Once done this will define: +# MYSQL_FOUND - If false, do not try to use MySQL. +# MYSQL_INCLUDE_DIRS - Where to find mysql.h, etc. +# MYSQL_LIBRARIES - The libraries to link against. +# MYSQL_VERSION_STRING - Version in a string of MySQL. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# Created by RenatoUtsch based on eAthena implementation. # -# There are special exceptions to the terms and conditions of the GPL -# as it is applied to this software. View the full text of the exception -# in file LICENSE.exceptions in the top-level directory of this software -# distribution. +# Please note that this module only supports Windows and Linux officially, but +# should work on all UNIX-like operational systems too. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. + +#============================================================================= +# Copyright 2012 RenatoUtsch # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. # -# The MySQL Connector/ODBC is licensed under the terms of the -# GPL, like most MySQL Connectors. There are special exceptions -# to the terms and conditions of the GPL as it is applied to -# this software, see the FLOSS License Exception available on -# mysql.com. - -########################################################################## +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +if( WIN32 ) + set(MYENV "PROGRAMFILES(X86)") + find_path( MYSQL_INCLUDE_DIR + NAMES "mysql.h" + PATHS "$ENV{PROGRAMFILES}/MySQL/*/include" + "$ENV{${MYENV}}/MySQL/*/include" + "$ENV{SYSTEMDRIVE}/MySQL/*/include" ) + + find_library( MYSQL_LIBRARY + NAMES "mysqlclient" "mysqlclient_r" "libmysql" + PATHS "$ENV{PROGRAMFILES}/MySQL/*/lib" + "$ENV{${MYENV}}/MySQL/*/lib" + "$ENV{SYSTEMDRIVE}/MySQL/*/lib" ) +else() + find_path( MYSQL_INCLUDE_DIR + NAMES "mysql.h" + PATHS "/usr/include/mysql" + "/usr/local/include/mysql" + "/usr/mysql/include/mysql" ) + + find_library( MYSQL_LIBRARY + NAMES "mysqlclient" "mysqlclient_r" + PATHS "/lib/mysql" + "/lib64/mysql" + "/usr/lib/mysql" + "/usr/lib64/mysql" + "/usr/local/lib/mysql" + "/usr/local/lib64/mysql" + "/usr/mysql/lib/mysql" + "/usr/mysql/lib64/mysql" ) +endif() -#-------------- FIND MYSQL_INCLUDE_DIR ------------------ -FIND_PATH(MYSQL_INCLUDE_DIR mysql.h - /usr/include/mysql - /usr/local/include/mysql - /opt/mysql/mysql/include - /opt/mysql/mysql/include/mysql - /opt/mysql/include - /opt/local/include/mysql5 - /usr/local/mysql/include - /usr/local/mysql/include/mysql - $ENV{ProgramW6432}/MySQL/*/include - $ENV{ProgramFiles}/MySQL/*/include - $ENV{SystemDrive}/MySQL/*/include) - -#----------------- FIND MYSQL_LIB_DIR ------------------- -IF (WIN32) - FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient - PATHS - $ENV{MYSQL_DIR}/lib/ - $ENV{MYSQL_DIR}/libmysql - $ENV{MYSQL_DIR}/libmysql/ - $ENV{MYSQL_DIR}/client/ - $ENV{MYSQL_DIR}/libmysql/ - $ENV{ProgramW6432}/MySQL/*/lib/ - $ENV{ProgramFiles}/MySQL/*/lib/ - $ENV{SystemDrive}/MySQL/*/lib/) -ELSE (WIN32) - FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r mysqlclient - PATHS - /usr/lib/mysql - /usr/local/lib/mysql - /usr/local/mysql/lib - /usr/local/mysql/lib/mysql - /opt/local/mysql5/lib - /opt/local/lib/mysql5/mysql - /opt/mysql/mysql/lib/mysql - /opt/mysql/lib/mysql) -ENDIF (WIN32) - -IF(MYSQL_LIB) - GET_FILENAME_COMPONENT(MYSQL_LIB_DIR ${MYSQL_LIB} PATH) -ENDIF(MYSQL_LIB) - -IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR) +IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) SET(MYSQL_FOUND TRUE) + SET( MYSQL_LIBRARIES ${MYSQL_LIBRARY} ) +ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) + SET(MYSQL_FOUND FALSE) + SET( MYSQL_LIBRARIES ) +ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) - INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) - LINK_DIRECTORIES(${MYSQL_LIB_DIR}) +IF (MYSQL_FOUND) + MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARY}") +ELSE (MYSQL_FOUND) + IF (MySQL_FIND_REQUIRED) + MESSAGE(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.") + MESSAGE(FATAL_ERROR "Could NOT find MySQL library") + ENDIF (MySQL_FIND_REQUIRED) +ENDIF (MYSQL_FOUND) - IF (MYSQL_LIB) - SET(MYSQL_CLIENT_LIBS ${MYSQL_LIB}) - ELSE() - SET(MYSQL_CLIENT_LIBS mysqlclient_r) - ENDIF() - # Added needed mysqlclient dependencies on Windows - IF (WIN32) - SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} ws2_32) - ENDIF (WIN32) - - MESSAGE(STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR} library dir: ${MYSQL_LIB_DIR}") - MESSAGE(STATUS "MySQL client libraries: ${MYSQL_CLIENT_LIBS}") -ELSEIF (MySQL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Cannot find MySQL. Include dir: ${MYSQL_INCLUDE_DIR} library dir: ${MYSQL_LIB_DIR}") -ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR) +MARK_AS_ADVANCED( + MYSQL_LIBRARY + MYSQL_INCLUDE_DIR +)