[Bf-blender-cvs] [c54ced9f552] master: Build: print TBB ON/OFF state on first configure, cleanup old TBB logic

[Brecht Van Lommel]

Commit: c54ced9f5529e2111144f29eadbada215f627fa0
Author: Brecht Van Lommel
Date:   Mon May 4 23:58:48 2020 +0200
Branches: master
https://developer.blender.org/rBc54ced9f5529e2111144f29eadbada215f627fa0

Build: print TBB ON/OFF state on first configure, cleanup old TBB logic

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

M	CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenlib/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19f25e3c108..ae9f3992aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1739,6 +1739,7 @@ if(FIRST_RUN)
   info_cfg_option(WITH_ALEMBIC)
   info_cfg_option(WITH_QUADRIFLOW)
   info_cfg_option(WITH_USD)
+  info_cfg_option(WITH_TBB)
 
   info_cfg_text("Compiler Options:")
   info_cfg_option(WITH_BUILDINFO)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 8e73afea3ac..07c7767f348 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -672,17 +672,6 @@ if(WITH_QUADRIFLOW)
   add_definitions(-DWITH_QUADRIFLOW)
 endif()
 
-if(WITH_TBB)
-  add_definitions(-DWITH_TBB)
-
-  list(APPEND INC_SYS
-    ${TBB_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${TBB_LIBRARIES}
-  )
-endif()
-
 if(WITH_XR_OPENXR)
   add_definitions(-DWITH_XR_OPENXR)
 endif()
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index d3bfb553329..ab9b3e19ab9 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -286,6 +286,10 @@ if(WITH_TBB)
   list(APPEND INC_SYS
     ${TBB_INCLUDE_DIRS}
   )
+
+  list(APPEND LIB
+    ${TBB_LIBRARIES}
+  )
 endif()
 
 if(WIN32)