From 7e36ab18482ab0e0c9f2971dbacaca23f5ca06f7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 26 Sep 2019 15:52:20 +0200 Subject: [PATCH] FindTBB.cmake: read both TBBROOT and TBB_ROOT Fix #4240 --- Installation/cmake/modules/FindTBB.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Installation/cmake/modules/FindTBB.cmake b/Installation/cmake/modules/FindTBB.cmake index b1a3d884c65..23caa1cbf9a 100644 --- a/Installation/cmake/modules/FindTBB.cmake +++ b/Installation/cmake/modules/FindTBB.cmake @@ -192,6 +192,11 @@ endmacro() # Get path, convert backslashes as ${ENV_${var}} getenv_path(TBB_ROOT) +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 "")