diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
| commit | c72380a427a4af9cacafc0e6bfe8f0f40c8e6dc5 (patch) | |
| tree | 5aec87124965bf543d1edc918f7c5bcd8c1cb9bb /CMakeLists.txt | |
| parent | c29d18c4c855025a0234435cc05dfad78d3d555f (diff) | |
| parent | fcf3aa90daed0dde8c770857990f92c6601f8096 (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 389287c04a7..f4dd45d5533 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1454,6 +1454,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/wd4305" # truncation from 'type1' to 'type2' "/wd4800" # forcing value to bool 'true' or 'false' "/wd4828" # The file contains a character that is illegal + "/wd4996" # identifier was declared deprecated # errors: "/we4013" # 'function' undefined; assuming extern returning int "/we4133" # incompatible pointer types |