diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
commit | ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch) | |
tree | 5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /cmake/os | |
parent | 5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff) | |
parent | 09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff) | |
download | mariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'cmake/os')
-rw-r--r-- | cmake/os/WindowsCache.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index a18f7cc7fe2..fe976b96592 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -31,7 +31,6 @@ SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "") SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "") SET(HAVE_BFILL CACHE INTERNAL "") SET(HAVE_BSD_SIGNALS CACHE INTERNAL "") -SET(HAVE_BSS_START CACHE INTERNAL "") SET(HAVE_CLOCK_GETTIME CACHE INTERNAL "") SET(HAVE_COMPRESS CACHE INTERNAL "") SET(HAVE_CRYPT CACHE INTERNAL "") |