Merge pull request #20835 from sthalik:msvc-no-thread-support

3 years ago · 4b0f8d76f4
parent 03a08435e2 d023f316ac
commit 4b0f8d76f4
1 changed files with 1 additions and 1 deletions
--- a/cmake/OpenCVFindFrameworks.cmake
+++ b/cmake/OpenCVFindFrameworks.cmake
@ -17,7 +17,7 @@ else()
 endif()

 # --- Concurrency ---
-if(MSVC AND NOT HAVE_TBB)
+if(MSVC AND NOT HAVE_TBB AND NOT OPENCV_DISABLE_THREAD_SUPPORT)
  set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/concurrencytest.cpp")
  file(WRITE "${_fname}" "#if _MSC_VER < 1600\n#error\n#endif\nint main() { return 0; }\n")
  try_compile(HAVE_CONCURRENCY "${CMAKE_BINARY_DIR}" "${_fname}")