diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
| commit | 11352d52cd35f89b1d573405fca92932e112cba9 (patch) | |
| tree | 77e2880d62fca5c7aa93d4a6bcfa299606e7f831 /cmake | |
| parent | 61096ff214dec68a66efb811aa3a70ef49f06a11 (diff) | |
| parent | 582545a38421ea0e43f326db84550773411c3261 (diff) | |
| download | mariadb-git-11352d52cd35f89b1d573405fca92932e112cba9.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'cmake')
| -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 67108132d8a..5b45c144b67 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -114,8 +114,8 @@ IF(MSVC) ENDIF() #TODO: update the code and remove the disabled warnings - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700") IF(CMAKE_SIZEOF_VOID_P MATCHES 8) # _WIN64 is defined by the compiler itself. |