diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 01:40:16 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:22:30 +0000 |
| commit | 53476abce829f14b9d591a9bf160bc07cffaa768 (patch) | |
| tree | 60288c4d65ece9f57a50aa017440659e1b902273 /cmake | |
| parent | 8fe04a3df37d65254142c6d1297eda32c1013f7f (diff) | |
| download | mariadb-git-53476abce829f14b9d591a9bf160bc07cffaa768.tar.gz | |
Windows, compiling : use /permissive- switch to improve conformance
fix a couple "initialization skipped by goto" and other new errors.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 851a42e7ad1..104c3899507 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -148,6 +148,9 @@ IF(MSVC) #TODO: update the code and remove the disabled warnings SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4700 /we4311 /we4477 /we4302 /we4090") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") + IF(MSVC_VERSION GREATER 1910) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") + ENDIF() ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS) IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |