diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-15 18:59:27 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-26 10:37:46 +0000 |
| commit | 477a1bc42b318e93baa3de5dbbd20c90aeaddc28 (patch) | |
| tree | e58785c5d299b0324121900b22463bde276f4015 /cmake | |
| parent | db28f0f8da5c5847366e6caeec4bf3e81781d94f (diff) | |
| download | mariadb-git-477a1bc42b318e93baa3de5dbbd20c90aeaddc28.tar.gz | |
Windows : fix compile warnings C4267, on 32bit first
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index b089a7f59f0..02c2d86617d 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -140,8 +140,11 @@ IF(MSVC) #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 /wd4996 /wd4291 /wd4577 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267") - + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4805 /wd4291 /wd4996 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090") + IF(CMAKE_SIZEOF_VOID_P EQUAL 8) + # Temporarily disable size_t warnings, due to their amount + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") + ENDIF() IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") |