diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 17:14:05 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:12:12 +0000 |
| commit | d995dd2865b4dd5d01175594ed667cfe8ce41712 (patch) | |
| tree | c5072261dd3a00d47d72e4f085822a68d7ec3ee5 /cmake/os | |
| parent | 7bcf5e2907db6a8f1178aca967c8d326be3e5e22 (diff) | |
| download | mariadb-git-d995dd2865b4dd5d01175594ed667cfe8ce41712.tar.gz | |
Windows : reenable warning C4805 (unsafe mix of types in bool operations)
Diffstat (limited to 'cmake/os')
| -rw-r--r-- | cmake/os/Windows.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index afd56cd903a..fef4bbe201e 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -146,8 +146,8 @@ IF(MSVC) ENDIF() #TODO: update the code and remove the disabled warnings - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4805 /wd4291 /wd4996 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4291 /wd4996 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") |