diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
| commit | f192b48d620d0e412a8324dda65a143c2852619e (patch) | |
| tree | 2744c49103142a1db66e2836055c0ec21dffc7cc /cmake | |
| parent | 71931fdf837b88e003998d12442a41c4f2c08c4a (diff) | |
| parent | 11352d52cd35f89b1d573405fca92932e112cba9 (diff) | |
| download | mariadb-git-f192b48d620d0e412a8324dda65a143c2852619e.tar.gz | |
Merge 10.1 into 10.2
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 22f1ff7f30d..37fd204ed72 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -139,8 +139,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") ENDIF() |