diff options
| author | Brecht Van Lommel <brecht> | 2021-02-10 20:17:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-10 21:32:24 +0300 |
| commit | 677e63d51869bb89f2ca1adee2e8350ed379005d (patch) | |
| tree | 70509efd6a2620f6dbebfd5e3f169a0bfe87e4d3 /CMakeLists.txt | |
| parent | 69c7ffff8bbdaa585b51fe3e4e36a7f37b5759b7 (diff) | |
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.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 00674809095..44385d81ff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1026,6 +1026,9 @@ if(WITH_OPENVDB) list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE) endif() + # OpenVDB headers use deprecated TBB headers, silence warning. + list(APPEND OPENVDB_DEFINITIONS -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1) + list(APPEND OPENVDB_INCLUDE_DIRS ${BOOST_INCLUDE_DIR} ${TBB_INCLUDE_DIRS} |