diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-28 14:13:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-28 14:13:09 +0300 |
| commit | 7fdb9e168dcd35d2695007cc77b3b27034a21cd5 (patch) | |
| tree | 614f5b6741644d6de394152724eb2d85c8d06c75 /CMakeLists.txt | |
| parent | 64de8c8f0de018f5d2b075db738d7b6322d6d21a (diff) | |
| parent | 75e8e3779bcf59622b9e7c43529ca9f91b40a917 (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 53c66a6302c..2f920474f09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1423,6 +1423,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/wd4800" # forcing value to bool 'true' or 'false' # errors: "/we4013" # 'function' undefined; assuming extern returning int + "/we4133" # incompatible pointer types "/we4431" # missing type specifier - int assumed ) |