Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-05-04 23:58:48 +02:00
parent be498a21ed
commit c54ced9f55
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -1739,6 +1739,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_ALEMBIC) info_cfg_option(WITH_ALEMBIC)
info_cfg_option(WITH_QUADRIFLOW) info_cfg_option(WITH_QUADRIFLOW)
info_cfg_option(WITH_USD) info_cfg_option(WITH_USD)
info_cfg_option(WITH_TBB)
info_cfg_text("Compiler Options:") info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO) info_cfg_option(WITH_BUILDINFO)

11
source/blender/blenkernel/CMakeLists.txt
View File

@@ -672,17 +672,6 @@ if(WITH_QUADRIFLOW)
add_definitions(-DWITH_QUADRIFLOW) add_definitions(-DWITH_QUADRIFLOW)
endif() 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) if(WITH_XR_OPENXR)
add_definitions(-DWITH_XR_OPENXR) add_definitions(-DWITH_XR_OPENXR)
endif() endif()

4
source/blender/blenlib/CMakeLists.txt
View File

@@ -286,6 +286,10 @@ if(WITH_TBB)
list(APPEND INC_SYS list(APPEND INC_SYS
${TBB_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
) )
list(APPEND LIB
${TBB_LIBRARIES}
)
endif() endif()
if(WIN32) if(WIN32)