diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:17:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:17:24 +0300 |
| commit | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (patch) | |
| tree | 8e6b460d1c8812d29444bf1bd7449e5871105215 /cmake/os/WindowsCache.cmake | |
| parent | 5bf4dee36943cb4cc95d10863d469192de854800 (diff) | |
| parent | e5c4f4e590d7782ef938b436f84ae11b68e0af08 (diff) | |
| download | mariadb-git-098c0f2634a35e24e9eb0f06d3fba69d0d097657.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'cmake/os/WindowsCache.cmake')
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index e2a4aa9e520..0310226c836 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -296,6 +296,11 @@ 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 "") SET(HAVE_ACCEPT4 CACHE INTERNAL "") SET(HAVE_LINK_H CACHE INTERNAL "") SET(HAVE_DLADDR CACHE INTERNAL "") @@ -319,7 +324,6 @@ SET(HAVE_BZLIB2_DECOMPRESS CACHE INTERNAL "") SET(HAVE_BZLIB2_H CACHE INTERNAL "") SET(HAVE_SNAPPY_H CACHE INTERNAL "") SET(HAVE_SCHED_GETCPU CACHE INTERNAL "") -SET(HAVE_NANOSLEEP CACHE INTERNAL "") SET(HAVE_PTHREAD_THREADID_NP CACHE INTERNAL "") SET(HAVE_SYS_GETTID CACHE INTERNAL "") SET(HAVE_GETTID CACHE INTERNAL "") |