From 25161fc56fe8b5769ae03d652308081d53a7a837 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 10 Oct 2017 14:18:28 +0300 Subject: [PATCH] tbb: don't search library in ENV{LD_LIBRARY_PATH} ENV{LIBRARY_PATH} is enough --- cmake/OpenCVDetectTBB.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake index 9417a53dd9..b1d55e9348 100644 --- a/cmake/OpenCVDetectTBB.cmake +++ b/cmake/OpenCVDetectTBB.cmake @@ -41,9 +41,9 @@ endfunction() function(ocv_tbb_env_guess _found) find_path(TBB_ENV_INCLUDE NAMES "tbb/tbb.h" PATHS ENV CPATH NO_DEFAULT_PATH) find_path(TBB_ENV_INCLUDE NAMES "tbb/tbb.h") - find_library(TBB_ENV_LIB NAMES "tbb" PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH NO_DEFAULT_PATH) + find_library(TBB_ENV_LIB NAMES "tbb" PATHS ENV LIBRARY_PATH NO_DEFAULT_PATH) find_library(TBB_ENV_LIB NAMES "tbb") - find_library(TBB_ENV_LIB_DEBUG NAMES "tbb_debug" PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH NO_DEFAULT_PATH) + find_library(TBB_ENV_LIB_DEBUG NAMES "tbb_debug" PATHS ENV LIBRARY_PATH NO_DEFAULT_PATH) find_library(TBB_ENV_LIB_DEBUG NAMES "tbb_debug") if (TBB_ENV_INCLUDE AND (TBB_ENV_LIB OR TBB_ENV_LIB_DEBUG)) ocv_tbb_verify()