diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
| commit | f61f36b386e8d0c6448297bb84c92e8d9b82be6a (patch) | |
| tree | 6248b04e9a41d2df2270ead15d62afde7f57aa69 /cmake | |
| parent | 2caeda442502b5ea2583a0ce15107d171e06dfcd (diff) | |
| parent | 55b010233a2d897ac8bc7aee0f136f2794814455 (diff) | |
| download | mariadb-git-f61f36b386e8d0c6448297bb84c92e8d9b82be6a.tar.gz | |
Merge branch '10.0' into 10.1
Conflicts:
CMakeLists.txt
VERSION
Modified:
.gitignore
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 2a6fb5ae31f..1453cc55053 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -370,4 +370,5 @@ SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "") SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "") SET(HAVE_UCONTEXT_H CACHE INTERNAL "") SET(HAVE_SOCKPEERCRED CACHE INTERNAL "") -ENDIF() +SET(HAVE_GGDB3 CACHE INTERNAL "") +ENDIF(MSVC) |