Skip to content

Commit

Permalink
Remove WA for Conan in TBB search (#19024)
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov authored Aug 8, 2023
1 parent a246003 commit 6f84f91
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/cmake/ie_parallel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,7 @@ endfunction()

macro(ov_find_package_tbb)
if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
# conan generates TBBConfig.cmake files, which follows cmake's
# SameMajorVersion scheme, while TBB itself follows AnyNewerVersion one
# see https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#generating-a-package-version-file
if(CMAKE_TOOLCHAIN_FILE MATCHES "conan_toolchain.cmake" OR CONAN_EXPORTED)
set(_ov_minimal_tbb_version 2021.0)
else()
set(_ov_minimal_tbb_version 2017.0)
endif()
set(_ov_minimal_tbb_version 2017.0)

if(NOT ENABLE_SYSTEM_TBB)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
Expand Down

0 comments on commit 6f84f91

Please sign in to comment.