diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-07-27 11:02:57 +0200 |
| commit | 3bb36e949534fc4a24d68d4297663ae8b80ba336 (patch) | |
| tree | 09907f6c2e82d718f261323075ffb33cb350fef7 /cmake | |
| parent | 9a897335eb4387980aed7698b832a893dbaa3d81 (diff) | |
| parent | bd935a41060199a17019453d6e187e8edd7929ba (diff) | |
| download | mariadb-git-3bb36e949534fc4a24d68d4297663ae8b80ba336.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/FreeBSD.cmake | 5 | ||||
| -rw-r--r-- | cmake/os/OpenBSD.cmake | 22 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 5 |
3 files changed, 5 insertions, 27 deletions
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index b9c335e4ddf..e1c764692bc 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -28,8 +28,3 @@ SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include) SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include) SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib") -FIND_LIBRARY(EXECINFO NAMES execinfo) -IF(EXECINFO) - SET(LIBEXECINFO ${EXECINFO}) -ENDIF() - diff --git a/cmake/os/OpenBSD.cmake b/cmake/os/OpenBSD.cmake deleted file mode 100644 index c8b91944275..00000000000 --- a/cmake/os/OpenBSD.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2012 Monty Program Ab, 2021 Brad Smith -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# 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 St, Fifth Floor, Boston, MA 02110-1335 USA - -# This file includes OpenBSD specific options and quirks, related to system checks - -# Find libexecinfo (library that contains backtrace_symbols etc) -FIND_LIBRARY(EXECINFO NAMES execinfo) -IF(EXECINFO) - SET(LIBEXECINFO ${EXECINFO}) -ENDIF() diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index bbf68add7d7..2a24405b690 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -302,4 +302,9 @@ SET(HAVE_SOCKPEERCRED CACHE INTERNAL "") SET(HAVE_ABI_CXA_DEMANGLE CACHE INTERNAL "") SET(HAVE_GCC_C11_ATOMICS CACHE INTERNAL "") SET(HAVE_VISIBILITY_HIDDEN CACHE INTERNAL "") +SET(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC CACHE INTERNAL "") +SET(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC CACHE INTERNAL "") +SET(HAVE_MPROTECT CACHE INTERNAL "") +SET(HAVE_C__Werror CACHE INTERNAL "") +SET(HAVE_NANOSLEEP CACHE INTERNAL "") ENDIF(MSVC) |