From 5343f3f7c4e3b200956e032f2920bcc47ea1a853 Mon Sep 17 00:00:00 2001
From: bcumming <bcumming@cscs.ch>
Date: Fri, 8 Jul 2016 10:11:56 +0200
Subject: [PATCH] fix cmake to find TBB installed from source
there was a problem with the FindTBB script for cmake where it cmake was
not looking in paths specified by the environment variable LIBRARY_PATH,
which meant that it was not finding the TBB library files when TBB had
been installed from source and configured with tbbvars.sh
---
cmake/FindTBB.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
index 7cb10d64..61caa664 100644
--- a/cmake/FindTBB.cmake
+++ b/cmake/FindTBB.cmake
@@ -178,7 +178,7 @@ if(NOT TBB_FOUND)
# Search for the libraries
find_library(TBB_${_comp}_LIBRARY_RELEASE ${_comp}
HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
- PATHS ${TBB_DEFAULT_SEARCH_DIR}
+ PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
PATH_SUFFIXES "${TBB_LIB_PATH_SUFFIX}")
find_library(TBB_${_comp}_LIBRARY_DEBUG ${_comp}_debug
--
GitLab