Skip to content

Commit 7fe07f4

Browse files
committed
Update FindTBB.cmake to work with latest MSVC.
1 parent 0ef5c50 commit 7fe07f4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

thrust/cmake/FindTBB.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ if (WIN32 AND MSVC)
236236
set(COMPILER_PREFIX "vc11")
237237
elseif(MSVC_VERSION EQUAL 1800)
238238
set(COMPILER_PREFIX "vc12")
239-
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1925)
239+
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1929)
240240
# 1900-1925 actually spans three Visual Studio versions:
241241
# 1900 = VS 14.0 (v140 toolset) a.k.a. MSVC 2015
242242
# 1910-1919 = VS 15.0 (v141 toolset) a.k.a. MSVC 2017
@@ -251,8 +251,9 @@ if (WIN32 AND MSVC)
251251
# - https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
252252
# - https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
253253
message(AUTHOR_WARNING
254-
"Unrecognized MSVC version. Please update FindTBB.cmake. "
255-
"Some TBB_* values may need to be set manually."
254+
"Unrecognized MSVC version (${MSVC_VERSION}). "
255+
"Please update FindTBB.cmake. "
256+
"Some TBB_* CMake variables may need to be set manually."
256257
)
257258
endif ()
258259

0 commit comments

Comments
 (0)