Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Update FindTBB.cmake to work with latest MSVC. #1281

Merged
merged 1 commit into from
Sep 21, 2020
Merged

Update FindTBB.cmake to work with latest MSVC. #1281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions thrust/cmake/FindTBB.cmake
View file
Open in desktop
Expand Up @@ -236,7 +236,7 @@ if (WIN32 AND MSVC)
set(COMPILER_PREFIX "vc11")
elseif(MSVC_VERSION EQUAL 1800)
set(COMPILER_PREFIX "vc12")
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1925)
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1929)
# 1900-1925 actually spans three Visual Studio versions:
# 1900 = VS 14.0 (v140 toolset) a.k.a. MSVC 2015
# 1910-1919 = VS 15.0 (v141 toolset) a.k.a. MSVC 2017
Expand All @@ -251,8 +251,9 @@ if (WIN32 AND MSVC)
# - https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
# - https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
message(AUTHOR_WARNING
"Unrecognized MSVC version. Please update FindTBB.cmake. "
"Some TBB_* values may need to be set manually."
"Unrecognized MSVC version (${MSVC_VERSION}). "
"Please update FindTBB.cmake. "
"Some TBB_* CMake variables may need to be set manually."
)
endif ()

Expand Down