[Bf-blender-cvs] [828525b2682] master: Fix: MSVC build error without TBB

Ray Molenkamp noreply at git.blender.org
Sat Nov 26 19:44:15 CET 2022


Commit: 828525b2682204d87a75c575fb813a8cf2227ba3
Author: Ray Molenkamp
Date:   Sat Nov 26 11:44:08 2022 -0700
Branches: master
https://developer.blender.org/rB828525b2682204d87a75c575fb813a8cf2227ba3

Fix: MSVC build error without TBB

windows.h once more providing min/max macro's when you least want them.

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

M	source/blender/editors/sculpt_paint/CMakeLists.txt

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

diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 393f9a376af..d1a80e3e068 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -101,11 +101,10 @@ 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.
+endif()
+
+if(WIN32)
     add_definitions(-DNOMINMAX)
-  endif()
 endif()
 
 blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")



More information about the Bf-blender-cvs mailing list