mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 08:45:33 +02:00
merge
This commit is contained in:
Daniel Fischer
commit
458d0e7ae0
13 changed files with 302 additions and 272 deletions
|
|
@ -80,9 +80,6 @@ IF(FEATURE_SET)
|
|||
ENDFOREACH()
|
||||
ENDIF()
|
||||
|
||||
SET(WITHOUT_AUDIT_NULL ON CACHE BOOL "")
|
||||
SET(WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL "")
|
||||
|
||||
OPTION(ENABLE_LOCAL_INFILE "" ON)
|
||||
SET(WITH_SSL bundled CACHE STRING "")
|
||||
SET(WITH_ZLIB bundled CACHE STRING "")
|
||||
|
|
@ -144,8 +141,8 @@ IF(UNIX)
|
|||
|
||||
# OSX flags
|
||||
IF(APPLE)
|
||||
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
|
||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
|
||||
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -Os -fno-common")
|
||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -Os -felide-constructors -fno-common")
|
||||
ENDIF()
|
||||
|
||||
# Solaris flags
|
||||
|
|
|
|||
|
|
@ -40,18 +40,25 @@
|
|||
#
|
||||
# - INSTALL_BINDIR (directory with client executables and scripts)
|
||||
# - INSTALL_SBINDIR (directory with mysqld)
|
||||
# - INSTALL_SCRIPTDIR (several scripts, rarely used)
|
||||
#
|
||||
# - INSTALL_LIBDIR (directory with client end embedded libraries)
|
||||
# - INSTALL_PLUGINDIR (directory for plugins)
|
||||
#
|
||||
# - INSTALL_INCLUDEDIR (directory for MySQL headers)
|
||||
#
|
||||
# - INSTALL_DOCDIR (documentation)
|
||||
# - INSTALL_MANDIR (man pages)
|
||||
# - INSTALL_SCRIPTDIR (several scripts, rarely used)
|
||||
# - INSTALL_MYSQLSHAREDIR (MySQL character sets and localized error messages)
|
||||
# - INSTALL_SHAREDIR (location of aclocal/mysql.m4)
|
||||
# - INSTALL_SQLBENCHDIR (sql-bench)
|
||||
# - INSTALL_MYSQLTESTDIR (mysql-test)
|
||||
# - INSTALL_DOCREADMEDIR (readme and similar)
|
||||
# - INSTALL_SUPPORTFILESDIR (used only in standalone installer)
|
||||
# - INSTALL_MANDIR (man pages)
|
||||
# - INSTALL_INFODIR (info pages)
|
||||
#
|
||||
# - INSTALL_SHAREDIR (location of aclocal/mysql.m4)
|
||||
# - INSTALL_MYSQLSHAREDIR (MySQL character sets and localized error messages)
|
||||
# - INSTALL_MYSQLTESTDIR (mysql-test)
|
||||
# - INSTALL_SQLBENCHDIR (sql-bench)
|
||||
# - INSTALL_SUPPORTFILESDIR (various extra support files)
|
||||
#
|
||||
# - INSTALL_MYSQLDATADIR (data directory)
|
||||
|
||||
IF(NOT INSTALL_LAYOUT)
|
||||
SET(DEFAULT_INSTALL_LAYOUT "STANDALONE")
|
||||
|
|
@ -60,15 +67,6 @@ ENDIF()
|
|||
SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
|
||||
CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) or UNIX")
|
||||
|
||||
#IF(NOT INSTALL_LAYOUT MATCHES "STANDALONE")
|
||||
# IF(NOT INSTALL_LAYOUT MATCHES "UNIX")
|
||||
# # XXX not keen on this, how many more will we need? prefer to just bail...
|
||||
# IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
|
||||
# SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}")
|
||||
# ENDIF()
|
||||
# ENDIF()
|
||||
#ENDIF()
|
||||
|
||||
IF(UNIX)
|
||||
IF(INSTALL_LAYOUT MATCHES "RPM")
|
||||
SET(default_prefix "/usr")
|
||||
|
|
@ -90,84 +88,111 @@ IF(UNIX)
|
|||
MARK_AS_ADVANCED(SYSCONFDIR)
|
||||
ENDIF()
|
||||
|
||||
#
|
||||
# STANDALONE layout
|
||||
SET(INSTALL_BINDIR_STANDALONE "bin")
|
||||
SET(INSTALL_SBINDIR_STANDALONE "bin")
|
||||
SET(INSTALL_LIBDIR_STANDALONE "lib")
|
||||
SET(INSTALL_INCLUDEDIR_STANDALONE "include")
|
||||
SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
|
||||
SET(INSTALL_DOCDIR_STANDALONE "docs")
|
||||
SET(INSTALL_MANDIR_STANDALONE "man")
|
||||
SET(INSTALL_INFODIR_STANDALONE "docs")
|
||||
SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
|
||||
SET(INSTALL_SHAREDIR_STANDALONE "share")
|
||||
SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
|
||||
SET(INSTALL_MYSQLTESTDIR_STANDALONE "mysql-test")
|
||||
SET(INSTALL_SQLBENCHROOTDIR_STANDALONE ".")
|
||||
SET(INSTALL_DOCREADMEDIR_STANDALONE ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
|
||||
SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
|
||||
#
|
||||
SET(INSTALL_BINDIR_STANDALONE "bin")
|
||||
SET(INSTALL_SBINDIR_STANDALONE "bin")
|
||||
SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
|
||||
#
|
||||
SET(INSTALL_LIBDIR_STANDALONE "lib")
|
||||
SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
|
||||
#
|
||||
SET(INSTALL_INCLUDEDIR_STANDALONE "include")
|
||||
#
|
||||
SET(INSTALL_DOCDIR_STANDALONE "docs")
|
||||
SET(INSTALL_DOCREADMEDIR_STANDALONE ".")
|
||||
SET(INSTALL_MANDIR_STANDALONE "man")
|
||||
SET(INSTALL_INFODIR_STANDALONE "docs")
|
||||
#
|
||||
SET(INSTALL_SHAREDIR_STANDALONE "share")
|
||||
SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
|
||||
SET(INSTALL_MYSQLTESTDIR_STANDALONE "mysql-test")
|
||||
SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
|
||||
#
|
||||
SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
|
||||
|
||||
#
|
||||
# RPM layout
|
||||
#
|
||||
SET(INSTALL_BINDIR_RPM "bin")
|
||||
SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
|
||||
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||
SET(INSTALL_LIBDIR_RPM "lib64")
|
||||
ELSE()
|
||||
SET(INSTALL_LIBDIR_RPM "lib")
|
||||
ENDIF()
|
||||
SET(INSTALL_SBINDIR_RPM "sbin")
|
||||
SET(INSTALL_SHAREDIR_RPM "share")
|
||||
SET(INSTALL_BINDIR_RPM "bin")
|
||||
SET(INSTALL_SBINDIR_RPM "sbin")
|
||||
SET(INSTALL_SCRIPTDIR_RPM "bin")
|
||||
#
|
||||
#SET(INSTALL_DOCDIR_RPM "XXXunset")
|
||||
#SET(INSTALL_DOCREADMEDIR_RPM "${INSTALL_DOCDIR_RPM}")
|
||||
SET(INSTALL_INFODIR_RPM "${INSTALL_SHAREDIR_RPM}/info")
|
||||
SET(INSTALL_MANDIR_RPM "${INSTALL_SHAREDIR_RPM}/man")
|
||||
SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql")
|
||||
SET(INSTALL_MYSQLSHAREDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql")
|
||||
SET(INSTALL_MYSQLTESTDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql-test")
|
||||
SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/mysql/plugin")
|
||||
SET(INSTALL_SCRIPTDIR_RPM "${INSTALL_BINDIR_RPM}")
|
||||
SET(INSTALL_SQLBENCHROOTDIR_RPM "")
|
||||
SET(INSTALL_SUPPORTFILESDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql")
|
||||
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||
SET(INSTALL_LIBDIR_RPM "lib64")
|
||||
SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
|
||||
ELSE()
|
||||
SET(INSTALL_LIBDIR_RPM "lib")
|
||||
SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
|
||||
ENDIF()
|
||||
#
|
||||
SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
|
||||
#
|
||||
#SET(INSTALL_DOCDIR_RPM unset - installed directly by RPM)
|
||||
#SET(INSTALL_DOCREADMEDIR_RPM unset - installed directly by RPM)
|
||||
SET(INSTALL_INFODIR_RPM "share/info")
|
||||
SET(INSTALL_MANDIR_RPM "share/man")
|
||||
#
|
||||
SET(INSTALL_SHAREDIR_RPM "share")
|
||||
SET(INSTALL_MYSQLSHAREDIR_RPM "share/mysql")
|
||||
SET(INSTALL_MYSQLTESTDIR_RPM "share/mysql-test")
|
||||
SET(INSTALL_SQLBENCHDIR_RPM "")
|
||||
SET(INSTALL_SUPPORTFILESDIR_RPM "share/mysql")
|
||||
#
|
||||
SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql")
|
||||
|
||||
#
|
||||
# DEB layout
|
||||
SET(INSTALL_BINDIR_DEB "bin")
|
||||
SET(INSTALL_SBINDIR_DEB "bin")
|
||||
SET(INSTALL_LIBDIR_DEB "lib")
|
||||
SET(INSTALL_INCLUDEDIR_DEB "include")
|
||||
SET(INSTALL_PLUGINDIR_DEB "lib/plugin")
|
||||
SET(INSTALL_DOCDIR_DEB "docs")
|
||||
SET(INSTALL_MANDIR_DEB "man")
|
||||
SET(INSTALL_INFODIR_DEB "docs")
|
||||
SET(INSTALL_MYSQLSHAREDIR_DEB "share")
|
||||
SET(INSTALL_SHAREDIR_DEB "share")
|
||||
SET(INSTALL_SCRIPTDIR_DEB "scripts")
|
||||
SET(INSTALL_MYSQLTESTDIR_DEB "mysql-test")
|
||||
SET(INSTALL_SQLBENCHROOTDIR_DEB ".")
|
||||
SET(INSTALL_DOCREADMEDIR_DEB ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_DEB "support-files")
|
||||
SET(INSTALL_MYSQLDATADIR_DEB "data")
|
||||
#
|
||||
SET(INSTALL_BINDIR_DEB "bin")
|
||||
SET(INSTALL_SBINDIR_DEB "bin")
|
||||
SET(INSTALL_SCRIPTDIR_DEB "scripts")
|
||||
#
|
||||
SET(INSTALL_LIBDIR_DEB "lib")
|
||||
SET(INSTALL_PLUGINDIR_DEB "lib/plugin")
|
||||
#
|
||||
SET(INSTALL_INCLUDEDIR_DEB "include")
|
||||
#
|
||||
SET(INSTALL_DOCDIR_DEB "docs")
|
||||
SET(INSTALL_DOCREADMEDIR_DEB ".")
|
||||
SET(INSTALL_MANDIR_DEB "man")
|
||||
SET(INSTALL_INFODIR_DEB "docs")
|
||||
#
|
||||
SET(INSTALL_SHAREDIR_DEB "share")
|
||||
SET(INSTALL_MYSQLSHAREDIR_DEB "share")
|
||||
SET(INSTALL_MYSQLTESTDIR_DEB "mysql-test")
|
||||
SET(INSTALL_SQLBENCHDIR_DEB ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_DEB "support-files")
|
||||
#
|
||||
SET(INSTALL_MYSQLDATADIR_DEB "data")
|
||||
|
||||
#
|
||||
# SVR4 layout
|
||||
SET(INSTALL_BINDIR_SVR4 "bin")
|
||||
SET(INSTALL_SBINDIR_SVR4 "bin")
|
||||
SET(INSTALL_LIBDIR_SVR4 "lib")
|
||||
SET(INSTALL_INCLUDEDIR_SVR4 "include")
|
||||
SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
|
||||
SET(INSTALL_DOCDIR_SVR4 "docs")
|
||||
SET(INSTALL_MANDIR_SVR4 "man")
|
||||
SET(INSTALL_INFODIR_SVR4 "docs")
|
||||
SET(INSTALL_MYSQLSHAREDIR_SVR4 "share")
|
||||
SET(INSTALL_SHAREDIR_SVR4 "share")
|
||||
SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
|
||||
SET(INSTALL_MYSQLTESTDIR_SVR4 "mysql-test")
|
||||
SET(INSTALL_SQLBENCHROOTDIR_SVR4 ".")
|
||||
SET(INSTALL_DOCREADMEDIR_SVR4 ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_SVR4 "support-files")
|
||||
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
|
||||
#
|
||||
SET(INSTALL_BINDIR_SVR4 "bin")
|
||||
SET(INSTALL_SBINDIR_SVR4 "bin")
|
||||
SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
|
||||
#
|
||||
SET(INSTALL_LIBDIR_SVR4 "lib")
|
||||
SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
|
||||
#
|
||||
SET(INSTALL_INCLUDEDIR_SVR4 "include")
|
||||
#
|
||||
SET(INSTALL_DOCDIR_SVR4 "docs")
|
||||
SET(INSTALL_DOCREADMEDIR_SVR4 ".")
|
||||
SET(INSTALL_MANDIR_SVR4 "man")
|
||||
SET(INSTALL_INFODIR_SVR4 "docs")
|
||||
#
|
||||
SET(INSTALL_SHAREDIR_SVR4 "share")
|
||||
SET(INSTALL_MYSQLSHAREDIR_SVR4 "share")
|
||||
SET(INSTALL_MYSQLTESTDIR_SVR4 "mysql-test")
|
||||
SET(INSTALL_SQLBENCHDIR_SVR4 ".")
|
||||
SET(INSTALL_SUPPORTFILESDIR_SVR4 "support-files")
|
||||
#
|
||||
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
|
||||
|
||||
|
||||
# Clear cached variables if install layout was changed
|
||||
IF(OLD_INSTALL_LAYOUT)
|
||||
|
|
@ -181,7 +206,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
|
|||
# will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
|
||||
# layout is chosen)
|
||||
FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
|
||||
INFO MYSQLTEST SQLBENCHROOT DOCREADME SUPPORTFILES MYSQLDATA)
|
||||
INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA)
|
||||
SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
|
||||
CACHE STRING "${var} installation directory" ${FORCE})
|
||||
MARK_AS_ADVANCED(INSTALL_${var}DIR)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
# Copyright (C) 2010 Sun Microsystems, Inc
|
||||
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -15,6 +15,9 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# This file includes FreeBSD specific options and quirks, related to system checks
|
||||
#Legacy option, maybe not needed anymore , taken as is from autotools build
|
||||
ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
|
||||
|
||||
# Should not be needed any more, but kept for easy resurrection if needed
|
||||
# #Legacy option, maybe not needed anymore , taken as is from autotools build
|
||||
# ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
|
||||
|
||||
ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue