diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-10 18:10:54 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 15:19:42 +0200 |
commit | 7e6b033507b783ff9b08ce17b2082e8dd5df7e8c (patch) | |
tree | 14c9b92fb4b228fc08ad6b1c38c963b2901c9113 | |
parent | ac064c2b4721fe3d7cafae3b4dfa5853f0797347 (diff) | |
download | mariadb-git-7e6b033507b783ff9b08ce17b2082e8dd5df7e8c.tar.gz |
Fix MYSQL_MAINTAINER_MODE=ERR, on Windows, with Ninja , in 10.2
A conversion warning 4267 that we want to disable(prior to 10.3),
was suppressed with cmake VS generator for C++ and C, despite being set
only for CXX flags.
The fix is to disable the warning in C flags, too. In 10.2, this warning
is noisy, in 10.3 it is fixed.
-rw-r--r-- | cmake/os/Windows.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 1eae92924a6..75a0d71cc2d 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -150,6 +150,7 @@ IF(MSVC) IF(CMAKE_SIZEOF_VOID_P EQUAL 8) # Temporarily disable size_t warnings, due to their amount SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267") ENDIF() IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |