diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
| commit | 6dd302d164d13d6c4793af9f03412ee092652226 (patch) | |
| tree | 40a566b6c1971bbf8bbf9d4e36c42f17dad84ef3 /cmake | |
| parent | 0ca2ea1a6550bb718efc878ed451be69e8244cd4 (diff) | |
| parent | cca611d1c083286396e34d8fc242bbeb90f01d2a (diff) | |
| download | mariadb-git-6dd302d164d13d6c4793af9f03412ee092652226.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 021f23a14f2..4fd01e5914e 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -142,6 +142,11 @@ IF(MSVC) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267 ") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267") + IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + ENDIF() + ENDIF() # Always link with socket library |