diff --git a/Installation/cmake/modules/FindTBB.cmake b/Installation/cmake/modules/FindTBB.cmake index d219735faa3..08189aa454c 100644 --- a/Installation/cmake/modules/FindTBB.cmake +++ b/Installation/cmake/modules/FindTBB.cmake @@ -195,6 +195,25 @@ endmacro() # Get path, convert backslashes as ${ENV_${var}} getenv_path(TBB_ROOT) +#start with looking for TBB_DIR and TBB_ROOT +if((TBB_ROOT OR "$ENV{TBB_ROOT}" OR "$ENV{TBB_DIR}" ) AND NOT TBB_FOUND) + find_package(TBB QUIET NO_MODULE NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) +endif() +if(TBB_FOUND) + return() +endif()#TBB_FOUND + +#try CONFIG Mode +find_package(TBB 2019.0.11005 QUIET NO_MODULE) +if(TBB_FOUND) + return() +endif()#TBB_FOUND + +if(NOT ENV_TBB_ROOT) + getenv_path(TBBROOT) + set(ENV_TBB_ROOT ${ENV_TBBROOT}) +endif() + # initialize search paths set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT}) set(TBB_INC_SEARCH_PATH "")