[Bf-blender-cvs] [fb98f22ddd5] master: MSVC: Fix build issue with TBB

[Ray Molenkamp]

Commit: fb98f22ddd5c814c01facacb48284acdfe8099fd
Author: Ray Molenkamp
Date:   Wed Jul 7 10:55:27 2021 -0600
Branches: master
https://developer.blender.org/rBfb98f22ddd5c814c01facacb48284acdfe8099fd

MSVC: Fix build issue with TBB

TBB includes in windows.h which will by
default define min/max macro's by default,
which collide with stl's min/mac functions.

this change instructs windows.h not to
add the offending macros

===================================================================

M	source/blender/nodes/CMakeLists.txt

===================================================================

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 4bfd75c4545..ec060de916b 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -420,6 +420,11 @@ if(WITH_TBB)
     ${TBB_INCLUDE_DIRS}
   )
   add_definitions(-DWITH_TBB)
+  if(WIN32)
+    # TBB includes Windows.h which will define min/max macros
+    # that will collide with the stl versions.
+    add_definitions(-DNOMINMAX)
+  endif()
 endif()
 
 if(WITH_IMAGE_OPENEXR)