From 677e63d51869bb89f2ca1adee2e8350ed379005d Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht>
Date: Wed, 10 Feb 2021 18:17:23 +0100
Subject: TBB: fix deprecation warnings with newer TBB versions

* USD and OpenVDB headers use deprecated TBB headers, suppress all deprecation
  warnings there since we have no control over them.
* For our own TBB includes, use the individual headers rather than the tbb.h that
  includes everything to avoid warnings, rather than suppressing all.

This is in anticipation of the TBB 2020 upgrade in D10359. Ref D10361.
---
 source/blender/io/usd/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source/blender/io/usd/CMakeLists.txt')

diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index 79b15c60b94..6ea30f48a13 100644
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -30,6 +30,9 @@ if(WIN32)
 endif()
 add_definitions(-DPXR_STATIC)
 
+# USD headers use deprecated TBB headers, silence warning.
+add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
+
 set(INC
   .
   ../common
-- 
cgit v1.2.3