diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
| commit | e95282e783f2cebb700c354ad181dd5efce50d04 (patch) | |
| tree | c775ea102783f363b90469f2cf5ba2bad1da4f79 /CMakeLists.txt | |
| parent | 4a3d94c0734d1475aa9a2fbe89039fbc59c9fb8d (diff) | |
| parent | 0301df40e5b6c51575d7f9013a1a28b901063829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfff781e922..d45cfefcb78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1461,6 +1461,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/wd4267" # conversion from 'size_t' to 'type', possible loss of data "/wd4305" # truncation from 'type1' to 'type2' "/wd4800" # forcing value to bool 'true' or 'false' + "/wd4828" # The file contains a character that is illegal # errors: "/we4013" # 'function' undefined; assuming extern returning int "/we4133" # incompatible pointer types |