diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-05-05 00:58:48 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-05 15:06:08 +0300 |
commit | c54ced9f5529e2111144f29eadbada215f627fa0 (patch) | |
tree | 720c7f7e22976b46cadd17fba1323b93baa70a9c | |
parent | be498a21edd8a6320fb25710b94e1229b0984d07 (diff) |
Build: print TBB ON/OFF state on first configure, cleanup old TBB logic
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 11 deletions
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) |