Merge pull request #9743 from DensityCo:tbb-debug

a9effeeb · Alexander Alekhin · 69103a9f · a56d7592 · a9effeeb
Commit a9effeeb authored Sep 29, 2017 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OpenCVDetectTBB.cmake cmake/OpenCVDetectTBB.cmake +1 -1

No files found.
--- a/cmake/OpenCVDetectTBB.cmake
+++ b/cmake/OpenCVDetectTBB.cmake
@@ -45,7 +45,7 @@ function(ocv_tbb_env_guess _found)
  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")
-  if (TBB_ENV_INCLUDE AND TBB_ENV_LIB)
+  if (TBB_ENV_INCLUDE AND (TBB_ENV_LIB OR TBB_ENV_LIB_DEBUG))
    ocv_tbb_verify()
    ocv_tbb_read_version("${TBB_ENV_INCLUDE}")
    add_library(tbb UNKNOWN IMPORTED)